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

correct svn merge

From: solo turn <soloturn99_at_yahoo.com>
Date: 2003-04-28 19:23:23 CEST

how would i merge issue-951 into trunk?

$ svn co https://svn.collab.net/repos/svn/trunk
$ cd trunk
$ svn merge https://svn.collab.net/repos/svn/branches/issue-951-dev/
.
$ svn merge https://svn.collab.net/repos/svn/branches/issue-951-dev/
.
svn: RA layer request failed
svn: REPORT request failed on '/repos/svn/branches/issue-951-dev'
svn: REPORT of '/repos/svn/branches/issue-951-dev': Could not read
response body: Secure connection truncated (https://svn.collab.net)

this way?
$ svn merge https://svn.collab.net/repos/svn/branches/issue-951-dev/
https://svn.collab.net/repos/svn/trunk

or the other way round?
$ svn merge https://svn.collab.net/repos/svn/trunk
https://svn.collab.net/repos/svn/branches/issue-951-dev/

or do i additionally specify some revision number, and if yes, where
do i get the correct one?

is it possible, that i cannot revert a change applied by a merge?

$ svn revert www
$ svn st www
MM www/cvs-changelog.html
 M www/cvs_help.html
D www/images
...

personally i'm lacking:
- clear, concise (short!) documentation
  (in book and "svn help merge")
- example for the "typical" case:
  branch an issue, and merge the result later.
  (in book)
- if you can't commit this working copy,
  show how you can do another (new?) branch to
  avoid the multiple merge problem.
  (in book)

__________________________________
Do you Yahoo!?
The New Yahoo! Search - Faster. Easier. Bingo.
http://search.yahoo.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 28 19:24:45 2003

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