svn merge ignored a revision
From: Todd C. Gleason <tgleason_at_impac.com>
Date: Thu, 19 Mar 2009 09:18:34 -0700
This is a corner case, and may be well-known, but I wanted to mention it
I recently ran a merge from a branch to the trunk, identifying all the
R1059 modified (several
R1210 modified (file X
R1963 modified (several
R1977 merged including r1968
Merge info supports this BUT
I manually modified the commit
to include R1059 changes
made in file X ONLY
and did not update mergeinfo
R2037 modified (file X)
R2189 final merge from branch,
specifying R1059 and R1210 but not R1963.
R1210 changes did not merge in.
--- Merging r1059 into '.':
C file X
--- Merging r1210 into '.':
G file X
Conflicted filenames looked like
file X.merge-left.r1058 and
Resolved conflicts. Manually integrated R1210.
Server: Svn 1.5.2 under Apache with NTLM running on Windows 2003
Client: Svn 1.5.5 under Windows XP using https. (http-library = serf)
So the question is: Did my manual merge of r1059, without updating
I'm also worried by the fact that, after I made the related R1059 and
So the problems I see here are:
1. The granularity at which you can run a merge. On occasion I
Is there anywhere that it looks like I made an error?
Also, I'm curious whether a svn 1.60 client and/or server improves this
Todd C. Gleason
Senior Software Development Engineer
ELEKTA, Impac Software
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
This is an archived mail posted to the Subversion Users mailing list.