You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Gabriela Gibson <ga...@gmail.com> on 2013/10/15 13:23:38 UTC
How to display the code in my branch without merge changes?
My goal is to get svn to show the current version of my code, without the
merged changes added from trunk.
I've tried a lot of different approaches by now (as advertised in svn help
diff), but nothing seems to do the trick.
thanks for any advice,
Gabriela
Re: How to display the code in my branch without merge changes?
Posted by Gabriela Gibson <ga...@gmail.com>.
On 15/10/13 15:14, Andrew Reedick wrote:
>
>
>> -----Original Message-----
>> From: Alfred Perlstein [mailto:bright@mu.org]
>> Sent: Tuesday, October 15, 2013 9:55 AM
>> To: Gabriela Gibson; John Maher
>> Cc: users@subversion.apache.org
>> Subject: Re: How to display the code in my branch without merge changes?
>>>
>>> ...snip...
>>>
>>>
>> If you are fully up to date with merges, then you should just be able to
>> diff against trunk. That should show you the differences between your
>> branch and the trunk (net changes).
>
> And if you aren't fully up to date, you can use a peg revision to limit trunk to the last merge, e.g. if r100 was the last merge to branch, and trunk is now at r999, then "svn diff ^/trunk@100".
>
>
Many thanks to everyone for the help,
svn diff ^/subversion/trunk@1531612
^/subversion/branches/invoke-diff-cmd-feature
finally hit the spot! :)
Gabriela
RE: How to display the code in my branch without merge changes?
Posted by Andrew Reedick <An...@cbeyond.net>.
> -----Original Message-----
> From: Alfred Perlstein [mailto:bright@mu.org]
> Sent: Tuesday, October 15, 2013 9:55 AM
> To: Gabriela Gibson; John Maher
> Cc: users@subversion.apache.org
> Subject: Re: How to display the code in my branch without merge changes?
> >
> > ...snip...
> >
> >
> If you are fully up to date with merges, then you should just be able to
> diff against trunk. That should show you the differences between your
> branch and the trunk (net changes).
And if you aren't fully up to date, you can use a peg revision to limit trunk to the last merge, e.g. if r100 was the last merge to branch, and trunk is now at r999, then "svn diff ^/trunk@100".
Re: How to display the code in my branch without merge changes?
Posted by Alfred Perlstein <br...@mu.org>.
On 10/15/13 6:26 AM, Gabriela Gibson wrote:
> On 15/10/13 13:24, John Maher wrote:
> Hi John,
>
>> Can you explain what you mean by “current version”. When you merge from
>> the trunk you change the current version. So the current version and
>> all versions afterward include the merged changes. Do you mean a
>> version BEFORE the merge? You can pass a revision to the diff command
>> to get the one you want.
>
> I want just the current 'net' code I wrote into my branch, minus the
> merge changes and various versions I tried in the process, ie, a neat
> version of what
>
> diff -r ~/trunk/subversion/
> ~/branches/invoke-diff-cmd-feature/subversion/
>
> would show me, supposing that I just have merged the trunk into the
> branch. So, branch - trunk = net code.
>
> I've merged the trunk into the branch a few times now in order to keep
> it up to date so there is no revision that I could go back to.
>
> thanks,
>
> Gabriela
>
>
If you are fully up to date with merges, then you should just be able to
diff against trunk. That should show you the differences between your
branch and the trunk (net changes).
--
Alfred Perlstein
Re: How to display the code in my branch without merge changes?
Posted by Gabriela Gibson <ga...@gmail.com>.
On 15/10/13 13:24, John Maher wrote:
Hi John,
> Can you explain what you mean by “current version”. When you merge from
> the trunk you change the current version. So the current version and
> all versions afterward include the merged changes. Do you mean a
> version BEFORE the merge? You can pass a revision to the diff command
> to get the one you want.
I want just the current 'net' code I wrote into my branch, minus the
merge changes and various versions I tried in the process, ie, a neat
version of what
diff -r ~/trunk/subversion/ ~/branches/invoke-diff-cmd-feature/subversion/
would show me, supposing that I just have merged the trunk into the
branch. So, branch - trunk = net code.
I've merged the trunk into the branch a few times now in order to keep
it up to date so there is no revision that I could go back to.
thanks,
Gabriela
RE: How to display the code in my branch without merge changes?
Posted by John Maher <Jo...@rotair.com>.
Can you explain what you mean by "current version". When you merge from the trunk you change the current version. So the current version and all versions afterward include the merged changes. Do you mean a version BEFORE the merge? You can pass a revision to the diff command to get the one you want.
From: Gabriela Gibson [mailto:gabriela.gibson@gmail.com]
Sent: Tuesday, October 15, 2013 7:24 AM
To: users@subversion.apache.org
Subject: How to display the code in my branch without merge changes?
My goal is to get svn to show the current version of my code, without the merged changes added from trunk.
I've tried a lot of different approaches by now (as advertised in svn help diff), but nothing seems to do the trick.
thanks for any advice,
Gabriela
RE: How to display the code in my branch without merge changes?
Posted by Andrew Reedick <An...@cbeyond.net>.
> From: Gabriela Gibson [mailto:gabriela.gibson@gmail.com]
> Sent: Tuesday, October 15, 2013 7:24 AM
> To: users@subversion.apache.org
> Subject: How to display the code in my branch without merge changes?
>
> My goal is to get svn to show the current version of my code, without the merged changes added from trunk.
>
> I've tried a lot of different approaches by now (as advertised in svn help diff), but nothing seems to do the trick.
>
> thanks for any advice,
>
> Gabriela
Create a new workspace and unmerge (aka reverse merge) the changes from trunk. Then diff the workspace. (You probably don't want to check-in the reverse merge changes.)
Or
Branch your code before the first trunk merge and cherry-pick merge your items to the new branch (i.e. don't merge over the trunk changes.)
Obviously, if your code relies on, or otherwise interacts with the trunk changes, then you'll have to tweak your code (and will probably go with the new branch option.)