On Mon, Nov 24, 2008 at 10:26:54PM -0600, David Fraser [EMAIL PROTECTED]
wrote:
Surely the merge has to be done anyway, whether it's done by Pootle or the
DVCS?
Anyway just thinking aloud...
See my other mail in this thread, it was a long one where I described
what functionality would I need
- Miklos Vajna [EMAIL PROTECTED] wrote:
On Thu, Nov 13, 2008 at 11:03:38AM +0200, Wynand Winterbach
[EMAIL PROTECTED] wrote:
Updating b219733..69c409c
abc.po: needs update
error: Entry 'abc.po' not uptodate. Cannot merge.
There is an easy solution for this: ask your users
On Mon, Nov 24, 2008 at 08:27:30AM -0600, David Fraser [EMAIL PROTECTED]
wrote:
Anyway given the insanity of the above I'm not sure it would work but
throwing it out there for fun. Incidentally if some of the above are
easier in another DVCS than git then it would be an incentive for
people
On Thu, Nov 13, 2008 at 08:39:52AM +0200, F Wolff [EMAIL PROTECTED] wrote:
conflict2suggest.py is really for handling conflicts caused by msgmerge
where the units will contain #-#-#-#-# markers with different
conflicting translations all indicated in one translations.
This is really
On Thu, Nov 13, 2008 at 11:03:38AM +0200, Wynand Winterbach [EMAIL PROTECTED]
wrote:
Updating b219733..69c409c
abc.po: needs update
error: Entry 'abc.po' not uptodate. Cannot merge.
There is an easy solution for this: ask your users to commit before they
update. The problem is that
[also shortening the reply a bit ...]
But I have to point that keeping the local file with changes in
the memory could be a bad idea if the computer or server that hosts
Pootle unexpectedly loss the energy supply.
You are right, this feels a little bit scary. But right now I can't think of a
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
Hi,
[shortening the reply a bit ...]
Assuming, that both the po and pot file in the repository are in sync, this
should not cause problems.
Could you provide a specific recipe to reproduce a potential problem,
please?
I don't understand this question. I think I have considered all
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
On Thu, 2008-11-13 at 03:21 +0100, Lars Kruse wrote:
snip
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
On Wed, 2008-11-12 at 17:31 -0800, Asheesh Laroia wrote:
snip
(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!
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 merged during
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 another
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, you really wanted to
Hi everyone
(I'm including OOo here, because you might want to use Mercurial with
Pootle)
The version control system in Pootle does not work well with distributed
version control systems (git, Mercurial, Bazaar, Darcs).
We have a proposed solution and would like feedback.
**
When a user
Hi Wynand,
The version control system in Pootle does not work well with distributed
version control systems (git, Mercurial, Bazaar, Darcs).
Thanks for taking the time to analyze issues with the distributed version
control systems!
I did some part of the version control code, but I don't have
On Thu, 13 Nov 2008, Lars Kruse wrote:
Now consider what happens if we have two modified files - file_1.po and
file_2.po - in our Pootle project.
The user attempts to update file_1.po.
Pootle:
1. loads file_1.po into memory,
2. reverts file_1.po to the version that was checked out from
Hi Asheesh,
Now consider what happens if we have two modified files - file_1.po and
file_2.po - in our Pootle project.
The user attempts to update file_1.po.
Pootle:
1. loads file_1.po into memory,
2. reverts file_1.po to the version that was checked out from the
version control
18 matches
Mail list logo
