[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Feature request (2) -- Updating the "copy from" history

From: Rob Hubbard <rob.hubbard_at_softel.co.uk>
Date: Fri, 13 Feb 2009 10:32:46 -0000

Sometimes when working on a source file, which I copy (with history) to
a new file, perhaps for a new feature
    $ svn up old_file
    $ svn cp old_file new_file
    A new_file
I now might make some changes to new_file.
I then find a bug in the old_file, which I fix and commit
    $ ### (edit old_file)
    $ svn ci old_file -m "fixed a bug"
    Committed revision 1250.
I can get the details of my copying thus:
    $ svn st -v
                 1250 1250 robh .
    A + - ? ? new_file
                 1250 1250 robh old_file
    $ svn info new_file | grep "Copied From"
    Copied From URL: http://repos/project/trunk/old_file
    Copied From Rev: 1234
Now I'd like to merge the fix into my as yet uncommitted copy and/or
move the point at which the copy refers. I'm not sure whether these
should be separated or combined (probably the latter) or what the syntax
should be. What I'd like to do is something like this:
    $ svn update new_file ### noting that new_file is an uncommitted
added file
    At revision 1250.
    $ svn merge old_file -c1250 new_file
    --- Merging r1250 into 'new_file':
    U new_file

    $ svn info new_file | grep "Copied From"

still shows the old information, and
    $ svn diff new_file
still shows both the merged changes and the local changes, rather than
just the latter. The fix has been merged.
I understand and accept that this is *correct*.
However, it's not always what I want. Is there a way to specify that I
want the history point to move? The syntax might be something like this:
    $ svn update new_file --update-copy-from
    $ svn merge old_file -c16 new_file --update-copy-from

Rob Hubbard.

This message has been independently scanned for the Softel Group and cleared of containing viruses and other malicious data.

Powering Television Beyond the Video (TM)


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-13 11:34:30 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.