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

commiting trunk checkout to a branch

From: Nikola Skoric <nskoric_at_gmail.com>
Date: Sat, 24 Oct 2009 19:21:28 +0200

First, the questions:
1) Can I commit changes on trunk checkout to a branch?
2) A branch has corrupt revision info (merge with trunk doesn't do nothing
but it should since I changed trunk). Can I fix that?

Now, details:

I develop my project on my desktop and on my laptop. I was commiting changes
on both computers to trunk (I didn't have any branches). At one point my
laptop was offline for extended period of time, I continued to develop on
both computers and voila: I have clasic trunk-branch situation. So I tried
to make my laptop version a branch. Since I my laptop code is checkout of
trunk, I can't just commit it to a branch since svn commit doesn't take urls
as parameters. Or, can I?

Anyway, svn info on laptop code said it is revision 22. So I created a
branch by copying that pegged revision of branch, checked it out, then
overwrote files of that checkout with my laptop files (no, I didn't
overwrite complete directories, I was careful not to harm my .svn
directories) and commited this to my branch. But, seems like this proces
didn't create a valid branch because "svn merge /url/to/trunk" does nothing.
I checked if the code is different, and yes, the code in trunk and branch is
different, but subversion doesn't realise that. Is there a way to make
subversion compare trunk code and branch code and produce list of changed
files disregarding mergeinfo property? I think that would solve my problem.

Thanks for help in advance :-)

"Strange women lying in ponds distributing swords is no basis for a system
of government."
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-24 19:27:03 CEST

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