----- "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 to commit before > they > update. The problem is that git expects that local changes are > committed > or dropped away before you pull, usually.
This is a late drop-in to the thread because it got me thinking... Basically the point of distributed version control is that you can easily handle branching and merging in multiple repositories. The ideal way to do this would be to regard: * The current edited Pootle repository as a branch (off of the last update from an upstream server) * The users downloaded files as a branch (from the Pootle branch, as of when the download took place) Then basically the version control system should know how to merge the above. The trick is of course to keep the version control info with the download/upload, and this may well make it so tricky that it doesn't get done. Problems include: * In git, for example, the "version control info" happens to be the whole repository by default * You can't easily separate this out for subdirectories * The users probably aren't using the version control system to commit their changes (though Pootle could start committing changes locally - this would be a good idea TM) * You'd need to make sure that the right information was included in the download * You'd also need to make sure that the merging was done in a way that didn't interfere with the operation of the server (i.e. it would be nice to do it in a separate directory to the live Pootle one, but checked out from the same repository) 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 to use that to manage their translation data... Cheers David ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Translate-pootle mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/translate-pootle
