--
From: "Bob Archer"
Sent: Thursday, April 21, 2011 11:17 AM
To: "Daniel Walter" ; "Stefan Sperling"
Cc:
Subject: RE: duplicate merge conflict
>> Record only should only make changes to the properties and
Record only should only make changes to the properties and not the files.
You can also just manually update the svn:merginfo on the trunk if you
want.
I think the problem is that because Daniel is using ancestrally
unrelated trees for the left and right side of his merge diff there
is no merge-
Like I said, we don't even have a path named "trunk".
The paths to the above versions in the repo would be like:
svn://server/repo/project/v1.0.0
svn://server/repo/project/v1.0.1 (this was copied from the 1.0.0 path)
svn://server/repo/project/v1.0.2 (this was copied from the 1.0.1 path)
On my
If you are merging everything in there is no need to worry. That is the
point of merge tracking. It will determine what has yet to be merged and
select the correct revisions.
Here is how we have our repo set up... rather than using trunk. We find it
makes things easier.
We basically "branch"
--
From: "Stefan Sperling"
Sent: Wednesday, April 20, 2011 6:38 AM
To: "Daniel Walter"
Cc: "Bob Archer" ;
Subject: Re: duplicate merge conflict
On Tue, Apr 19, 2011 at 09:34:17PM -0400, Daniel Walter wrote:
I u
t: Tuesday, April 19, 2011 6:50 PM
To: "Daniel Walter"
Cc: "Bob Archer" ;
Subject: Re: duplicate merge conflict
On Tue, Apr 19, 2011 at 10:56:28AM -0400, Daniel Walter wrote:
svn merge appears to work with revision numbers but not symbolically
with tags. Is this expected?
Th
and then do the merge based on these revision numbers
svn merge -r 457:467 trunk --non-interactive
the merge happens correctly
--
From: "Bob Archer"
Sent: Thursday, April 14, 2011 1:38 PM
To: "Daniel Walter" ;
Subject:
would be the last commit before the svn
copy and 462 is the svn copy itself.
--
From: "Bob Archer"
Sent: Thursday, April 14, 2011 1:38 PM
To: "Daniel Walter" ;
Subject: RE: dupl
I reverted to the original source and verified it. It had no conflicts.
Then I did the merge again. The same thing happened and I ended up with
duplicate conflicts again.
--
From: "Bob Archer"
Sent: Thursday, April 14, 2011 9:33 AM
T
When I merge changes in SVN, the merges work well except for the conflicts.
For some reason, the merges are frequently (but not always done twice). As an
example:
<<< .working
<<< .working
const int SERIALIZE_FIELDS_DATA_LENGTH = 83;
===
const int SERIALIZE_FIELDS_DATA_LENGTH = 91;
10 matches
Mail list logo
