Re: svn redo after reverse merge

Actually it works with --ignore-ancestry option

 i.e. svn merge -c 8 svn://repository/trunk --ignore-ancestry

Ankush

________________________________
From: ankush chadha <ankushchadha2003_at_yahoo.com>
To: Ryan Schmidt <subversion-2010b_at_ryandesign.com>
Cc: "Cooke, Mark" <mark.cooke_at_siemens.com>; users_at_subversion.apache.org
Sent: Thu, September 2, 2010 2:47:17 PM
Subject: Re: svn redo after reverse merge

Ryan

I tried following

svn co svn://repository/trunk

svn merge -r 10:7 svn://repository/trunk

svn commit -m "undo rev 10, 9, 8"

svn merge -c 8 svn://repository/trunk
No changes in redo operation - svn status returns nothing

Branching is I believe ideal solution but I have some restrictions of creating a
branch as of now. So as of now, if I have to perform redo operation it will be
to create a patch first using svn diff and then apply this patch and then commit
changes.

Ankush

________________________________
From: Ryan Schmidt <subversion-2010b_at_ryandesign.com>
To: ankush chadha <ankushchadha2003_at_yahoo.com>
Cc: "Cooke, Mark" <mark.cooke_at_siemens.com>; users_at_subversion.apache.org
Sent: Thu, September 2, 2010 1:12:36 PM
Subject: Re: svn redo after reverse merge

On Sep 2, 2010, at 08:46, ankush chadha wrote:

> Suppose there is a source folder that contains around 50 modules. There were
>lot of changes made to this source folder say around 20 new features. Once
>everything was checked in, we realized that for the current release we just need
>feature A and B and rollback everything else. We want all the merge history, any
>history. Ideally we should branch at an early revision and then add feature A
>and B. But in my case I cannot create a branch now. I hope this helps.

I don't know why what you tried didn't work. But, another approach could be to
create a branch of some past revision, then merge in any additional changes
needed.

      
Received on 2010-09-02 21:19:22 CEST