svn has many great features, but failure to use good practices
can lead to messy situations like the one you describe.
rule #1 is to commit as often as possible (provided code
compiles and is supposed to work). the more you commit and
update merging issues will be easier, if the exist at all.
however, from time to time you'll find yourself in a situation
that you've done plenty of changes, these changes work,
but when you want to commit, you need to update and
svn status -u shows that you'll be in trouble merging. how to
store your reliable WC snapshot into the repo?
it is time to do an emergency branching. svn log -r BASE
should tell you when you last svn updated. then create a
branch from that revision, and copy your WC there. safely
commit, and leave the merging issues for later.
2007/11/22, pinky goyal <pinks.forums@gmail.com>:
> Hi All!
>
> I need help regarding the merge.
>
> when i merge my changes into the branch and after that when i try to
> commit the changes i get errors.
>
> if 2-3 people are working on same branch.they all are working on
> simultaneously. before committing the changes, merging should be done
> or update should be done . ???
>
> if anyone can help me out what is the right procedure to work on a
> single branch with multiple users.?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 5 00:30:00 2007