subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bob Archer <Bob.Arc...@amsi.com>
Subject RE: fixing foobared merge with --record-only
Date Mon, 21 Jun 2010 17:03:54 GMT
> Here is my thought:
> 
> Currently the v0.9.4 branch is r1087, the trunk is r1085.
> 
> 1: Manually copy over all the changes from the current v0.9.4
> branch
> to the trunk and check in the truck, making revision 1088.
> 
> 2: Next time I do a merge from the branch to the trunk, I use the
> --record-only to copy over starting at r1085.
> 
> Sam

Actually I think you would do something like:

1: Manually copy over all the changes from the current v0.9.4 branch to the trunk and commit
the truck, making revision 1088. (the rev numbers aren't all that relevant. I think you don't
have a firm understanding of them since you say branch is x and trunk is y)

2: Do a merge NOW from the branch to the trunk using the --record-only option. Do not select
and revs let subversion determine which ones are eligible.

Once you've done that you have basically manually made sure any branch changes exist in trunk
then record that fact.

> Is that correct?  How does one to a --record-only from TortoiseSVN?
>

There is an "Only record the merge" check box on the TSVN merge wizard. Make sure you have
that checked. 

BOb




Mime
View raw message