RE: Question about Branching/Merging practices
From: Srilakshmanan, Lakshman <lakshman.srilakshmanan_at_police.vic.gov.au>
Date: Tue, 18 Mar 2008 14:21:20 +1100
Hi Lars,
Sorry I am bit late replying to your email, hope it's not too late.
Assuming you have taken all changes from trunk into your branch then you
svn co svn://trunk wc-trunk
If you have taken all the changes from trunk into branch, since taking
Thanks
-----BEGIN PGP SIGNED MESSAGE-----
Hi there,
I have a problem with a specific "use case" of subversion, considering
But in my current working environment with more than 10 developers
1. we reach a point where we need to branch from trunk for a second dev
2. while those 2nd branch is "in the works", there where some bugfixes
3. we decide that we need those bugfixes *immediatly* in the branch,
branch_wd:> svn commit
4. so far so good. The branch continues, and we finally reach completion
5. now we want to merge all changes from the branch back to trunk:
trunk_wd:> svn merge -r100:140 svn://branch
Wupps: this will lead to some conflicts, because we will actually
But what can be done to avoid this? Is there a possibility to somehow
Should we do two merges, like:
svn merge -r100:110 svn://branch
which would obviously ignore the merged changes from trunk, but leads to
With best regards,
- --
-----BEGIN PGP SIGNATURE-----
iD8DBQFH2QmpISCS20rPIYsRApbsAJwL076UsiWryXYvFbuwzgSvpphgCwCfUa4n
---------------------------------------------------------------------
================================================================================================
This email and any attachments are confidential. They may also be subject to copyright.
If you are not an intended recipient of this email please immediately contact us by replying
You must not read, use, copy, retain, forward or disclose this email or any attachment.
We do not accept any liability arising from or in connection with unauthorised use or disclosure
We make reasonable efforts to protect against computer viruses but we do not accept liability
---------------------------------------------------------------------
|
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.