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

Merging from Branch (Tag) to trunk

From: Stephen McConnell <mcconnell_stephen_at_yahoo.com>
Date: 2005-02-25 15:17:27 CET

I'm back.... ;)

I have now read and re-read the Subversion Manual. I have a copy of
"Pragmatic Version Control Using Subversion" (PVCUS) (excellent
book!!). And I though I had our problem solved.

We have adopted the method that is discussed in PVCUS Chapter 8 where
we have a release branch (trunk) and each Ticket is a "tag" that the
developer works on and we merge back into a local Working Copy of
trunk; then commit the merges.

This is truely a WHOLE Lot more work that it should be... especially
when we have 30 developers doing fixes and the "SCM manager" (which has
defaulted to me because nobody else wants the hassel) has to do all the
merging back into trunk.... A part time job has turned into a full
time job....

Yesterday, the process worked fine. I merged changes from the bug fixe
Tags into trunk ok. Today, doing the exact same process, the Merging
SAYS it updates the files, but when I look in the local working copy
there is no change in the file....

Any idea what's going on? I perform exactly the same step today as I
did yesterday; and the log says everything worked, but it didn't.

Stephen McConnell


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 25 15:20:07 2005

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.