Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > Re: svn 1.5 merge -c revision and svn diff/log confusion

subversion
Discussion topic

Back to topic list

Re: svn 1.5 merge -c revision and svn diff/log confusion

Author steinsomers
Full name Stein Somers
Date 2009-10-30 09:05:07 PDT
Message In other words, to make way Bob's method 1. work, without interference by
spurious mergeinfo, you want everyone to avoid committing spurious mergeinfo
below the working copy but still preserve the real mergeinfo on the top folder.

How can you do that? What I actually did at the time was:

    svn propget svn:mergeinfo . > some_temporary_file
    svn propdel svn:mergeinfo -R
    svn propset svn:mergeinfo . -F some_temporary_file

Is there a neater way? Something like

    svn propdel svn:mergeinfo --depth infinity_but_skip_top_folder

--
Stein

« Previous message in topic | 10 of 12 | Next message in topic »

Messages

Show all messages in topic

svn 1.5 merge -c revision and svn diff/log confusion lorak Karol Szkudlarek 2009-10-28 08:17:28 PDT
     Re: svn 1.5 merge -c revision and svn diff/log confusion tylermr Tyler Roscoe 2009-10-28 08:43:09 PDT
         Re: svn 1.5 merge -c revision and svn diff/log confusion lorak Karol Szkudlarek 2009-10-28 12:40:26 PDT
             Re: svn 1.5 merge -c revision and svn diff/log confusion steinsomers Stein Somers 2009-10-29 11:50:15 PDT
                 RE: Re: svn 1.5 merge -c revision and svn diff/log confusion karolszk Karol Szkudlarek 2009-10-30 05:19:14 PDT
                     RE: Re: svn 1.5 merge -c revision and svn diff/log confusion pilotbob Bob Archer 2009-10-30 07:24:55 PDT
                         RE: Re: svn 1.5 merge -c revision and svn diff/log confusion pilotbob Bob Archer 2009-10-30 07:27:29 PDT
                             Re: svn 1.5 merge -c revision and svn diff/log confusion steinsomers Stein Somers 2009-10-30 08:33:09 PDT
                                 RE: Re: svn 1.5 merge -c revision and svn diff/log confusion karolszk Karol Szkudlarek 2009-11-02 05:14:50 PST
                             Re: svn 1.5 merge -c revision and svn diff/log confusion steinsomers Stein Somers 2009-10-30 09:05:07 PDT
                                 Re: svn 1.5 merge -c revision and svn diff/log confusion steinsomers Stein Somers 2009-10-30 12:44:43 PDT
                                 Re: svn 1.5 merge -c revision and svn diff/log confusion steinsomers Stein Somers 2009-10-30 12:44:42 PDT
Messages per page: