On Mon, Feb 15, 2010 at 12:17:17AM -0600, Jonathan Nieder wrote: > retitle 493646 git cvsimport -m: too eager to declare a merge > reassign 493646 git-cvs > thanks > > Kurt Roeckx wrote: > > > I think they're mostly created using git cvsimport, which seems > > to be doing something else and makes it show up as a merge. > [...] > It detects merges by looking at the commit message and is not smart > enough to tell when this was just a backport of a few patches from a > branch.
If it has the same commit message (and is on a different branch), it's probably just that patch that is applied. > I do not know how much information CVS actually records about a merge. > Is the information you want available in CVS? Can it be determined > locally (from looking at ,v files) or remotely (with cvs log or rlog)? As far as I know, a cvs merge just takes a bunch of commits from 1 branch, turns that in a patch and applies that patch in an other branch. And then you have to commit that patch, possibly after resolving any conflict. Cvs doesn't even track a commit over several files, and this is basicly guessed by looking at the commit message and timestamp to see if this is 1 commit or not. Kurt -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100215191202.ga14...@roeckx.be
