Re: [translate-pootle] Pootle version control problems with distributed version control systems

2008-11-13 Thread Lars Kruse
Hi, > > Your example shows, that it is necessary to "update" before "commit". The > > same issue is valid for subversion and probably also for the other VCS. > > > > Maybe we should change pootle's code to do an update before commit by > > default? > > > > > > Did I get your point now? > > Hey, y

Re: [translate-pootle] Pootle version control problems with distributed version control systems

2008-11-13 Thread Leandro Regueiro
> Your example shows, that it is necessary to "update" before "commit". The same > issue is valid for subversion and probably also for the other VCS. > > Maybe we should change pootle's code to do an update before commit by default? > > > Did I get your point now? Hey, you really wanted to say ano

Re: [translate-pootle] Pootle version control problems with distributed version control systems

2008-11-13 Thread Lars Kruse
Hi, > From Lars's response: > > I just wanted to point out, that during step (3) the file "file_2.po" is > also merged with the current state in the VCS upstream repository. I am not > sure, if that was important for Wynand's example. > > That is really the problem. If other files are merge

Re: [translate-pootle] Pootle version control problems with distributed version control systems

2008-11-13 Thread Dwayne Bailey
On Wed, 2008-11-12 at 17:31 -0800, Asheesh Laroia wrote: > (BTW: Hi all, I'm new to the list. I'm working on internationalization at > Creative Commons and spending a lot of time lately talking to Wil Clouser > of Mozilla on #pootle, where my nick is paulproteus.) Great to see you here! Wel

Re: [translate-pootle] Pootle version control problems with distributed version control systems

2008-11-13 Thread Dwayne Bailey
On Thu, 2008-11-13 at 03:21 +0100, Lars Kruse wrote: > > Not that I've seen. I'd appreciate more examples in this discussion, like > > the one you gave that shows it doesn't seem to be a problem. > > > > Furthermore, this issue isn't strictly related to DVCSs, I think. Doesn't > > conflict2

Re: [translate-pootle] Pootle version control problems with distributed version control systems

2008-11-13 Thread Wynand Winterbach
Hi everyone I am so rude sometimes. Welcome Asheesh :). From Lars's response: I just wanted to point out, that during step (3) the file "file_2.po" is also merged with the current state in the VCS upstream repository. I am not sure, if that was important for Wynand's example. That is