select nonmerging files?

["Ketil Z. Malde" <ke...@ii.uib.no>]

Hi,

(Apologies if usage questions are inappropriate.  If so, consider it a
feature request :-)

When I'm using a branch for development of a specific feature, I may
want to define the planned development in a file in that tree.
However, I don't want the plan to be merged back along with the rest
of the changes when the development is completed.

Is this possible?  Can I set this as a property of the file, for
instance?  Or must I maintain this file outside of the branch tree? 

(Thinking about it, that mightn't be so bad, I could have

        trunk/TODO
              src
              doc
              tests
              ...
        branches/PLAN.br1
                 br1/
                 PLAN.br2
                 br2/

but that would mean the plan wouldn't get checked out along with the
br1 tree, which would be preferrable.)

-kzm
-- 
If I haven't seen further, it is by standing in the footprints of giants

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: select nonmerging files?

[Philip Martin <ph...@codematters.co.uk>]

ketil@ii.uib.no (Ketil Z. Malde) writes:

> When I'm using a branch for development of a specific feature, I may
> want to define the planned development in a file in that tree.
> However, I don't want the plan to be merged back along with the rest
> of the changes when the development is completed.

When the branch is ready to merge you could commit a deletion of the
extra file, then it won't get merged.  The file will still be present
in older versions of the branch.

> Is this possible?  Can I set this as a property of the file, for
> instance?  Or must I maintain this file outside of the branch tree? 

There is no "magic" property you can set, however merge always puts
its results into a working copy, and you can adjust that before
committing. So given

  repo/trunk/bar.c
             foo.c
       branches/b1/bar.c
                   foo.c
                   zag.c
                   zig.c
                   zog.c

Check-out the trunk

   $ svn co http://host/repo/trunk wc
   A  wc/bar.c
   A  wc/foo.c

Merge the branch into the working copy

   $ svn merge -rX:Y http://host/repo/branches/b1 wc
   M  wc/bar.c
   A  wc/zag.c
   A  wc/zig.c
   A  wc/zog.c

I don't want to merge zog.c

   $ svn rm --force wc/zog.c

Commit the remaining bits of the merge

   $ svn ci wc
   Adding   wc/zag.c
   Adding   wc/zig.c
   Sending  wc/bar.c

-- 
Philip Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org