On Jul 15, 2009, at 15:31, Christopher Clarke wrote:
> I see your point. The problem I am trying to solve is how to deal with
> files that have been added to the repository and need to exist in each
> working copy but that also need to be different in each working copy.
If the file in question already has local modifications in everyone's
working copy, then there is no problem. Subversion will not
automatically delete files with local modifications. See this
transcript which shows that, even though I rename a "config"
directory to "config.sample", a working copy with local changes to a
file in the "config" directory will still have that "config"
directory with its modified file in it after updating. There is still
the conflict to resolve somehow, though.
$ svnadmin create repo
$ svn co file://$(pwd)/repo wc1
Checked out revision 0.
$ mkdir wc1/config
$ echo "hello" > wc1/config/some.txt
$ svn add wc1/config
A wc1/config
A wc1/config/some.txt
$ svn ci -m "" wc1/config
Adding wc1/config
Adding wc1/config/some.txt
Transmitting file data .
Committed revision 1.
$ svn co file://$(pwd)/repo wc2
A wc2/config
A wc2/config/some.txt
Checked out revision 1.
$ echo "goodbye" > wc2/config/some.txt
$ svn mv wc1/config wc1/config.sample
A wc1/config.sample
D wc1/config/some.txt
D wc1/config
$ svn ci wc1 -m ""
Deleting wc1/config
Adding wc1/config.sample
Committed revision 2.
$ svn up wc2
C wc2/config
A wc2/config.sample
A wc2/config.sample/some.txt
Updated to revision 2.
Summary of conflicts:
Tree conflicts: 1
$ svn st wc2
A + C wc2/config
> local edit, incoming delete upon update
M + wc2/config/some.txt
$ l wc2/
.svn config config.sample
$ ls -l wc2/*
wc2/config:
total 8
-rw-r--r-- 1 rschmidt wheel 8 Jul 15 18:58 some.txt
wc2/config.sample:
total 8
-rw-r--r-- 1 rschmidt wheel 6 Jul 15 18:58 some.txt
$
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371643
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-16 02:04:05 CEST