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

Adding a new file to a patch work flow problem

From: Barry Scott <barry_at_barrys-emacs.org>
Date: 2003-12-17 21:22:47 CET

I came across this problem when I was submitting a patch against
rapidsvn. IS this a candidate to fix for 1.0 as this is very
inconvenient for patch submitters? Do you want a issue logged?

Workflow:

1. create patch that adds a file
2. submit patch to maintainer
3. maintainer merges the patch to the repo
4. update wc fails

> prompt addbug:$S

addbug: if exist repo rmdir /s /q repo

addbug: if exist wc1 rmdir /s /q wc1

addbug: if exist wc2 rmdir /s /q wc2

addbug: svnadmin create repo

addbug: svn mkdir file:///l:/subversion/bugs/repo/fred -m blah1

Committed revision 1.

addbug: rem work on patch for fred

addbug: svn co file:///l:/subversion/bugs/repo/fred wc1
Checked out revision 1.

addbug: echo file1 1>wc1/file1.txt

addbug: svn add wc1/file1.txt
A wc1\file1.txt

addbug: rem merge patch for fred

addbug: svn co file:///l:/subversion/bugs/repo/fred wc2
Checked out revision 1.

addbug: echo file1 1>wc2/file1.txt

addbug: svn add wc2/file1.txt
A wc2\file1.txt

addbug: svn ci wc2 -m blah2
Adding wc2\file1.txt
Transmitting file data .
Committed revision 2.

addbug: rem see if patch was done as submitted

addbug: svn update wc1
svn: Obstructed update
svn: Failed to add file 'wc1/file1.txt': object of the same name already exists

addbug: endlocal

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

Received on Wed Dec 17 21:23:56 2003

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

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