svn not merging properly
From: BlueWolf_ <josr91_at_gmail.com>
Date: Thu, 12 Mar 2009 03:46:06 -0700 (PDT)
I am using svn for a long time, now. I know the concept of branches and
Just for the information: I got a project in /trunk/Client in the repos
/branches/Client-tablet is now in r29, which is just a copy of
after a checkout of Client-tablet, I did this: 'svn merge
This is where the fun begins... first of all, is says:
--- Merging r3 through r29 into '.':
That doesn't sounds good. Why all those previous revisions? It then tries to
Conflict for property 'svn:ignore' discovered on ''.
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(h) help for more options: df
--- .3.tmp di mrt 10 14:53:52 2009
+++ .4.tmp di mrt 10 14:53:52 2009
@@ -1 +1,2 @@
config
+statusSave
Anyway, I did 'mf' on all conflicts... after that, svn status shows nothing.
I think I gave very much info about what I did, does anybody know what I'm
Thank you in advanced,
BlueWolf(Production)
-- View this message in context: http://www.nabble.com/svn-not-merging-properly-tp22472781p22472781.html Sent from the Subversion Users mailing list archive at Nabble.com. ------------------------------------------------------ http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1312276 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].Received on 2009-03-12 11:46:53 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.