Le jeudi 30 décembre 2010 à 14:24 -0600, Benjamin Peterson a écrit :
2010/12/30 Antoine Pitrou
: On Thu, 30 Dec 2010 20:57:11 +0100 Éric Araujo
wrote: Hi,
One thing confuses me in this thread: Do the problems come from merging across different versions (i.e. different syntax and module names), or are they regular problems that come up because people don’t want to use a merge tool? I for one immensely like Mercurial’s merge and utterly dislike Subversion’s (certainly because I’ve learned a good merge tool and don’t have a good editor to handle files with conflict markers).
IIUC this is not about merges, this is about transplants (or cherry-picking). It would be unannoying to lose svnmerge's relative convenience in that matter.
I assume you meant "annoying"?
Well, yes. I should stop twisting my negatives (whatever it means). Antoine.