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

Re: Branch and Merge problem?

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: Wed, 3 Mar 2010 13:14:29 +0100

On Wednesday 03 March 2010, Edwin wrote:
> In my operation case, all of our production go publish need to pass QA
> testing and then on board.
> if there are bugs in earlier version which is production already,we
> have to fix in few hours.
> if the bugs are already fixed in QA ex.v1.1.0 is production v1.1.1
> testing not finish
> we need to fix v1.1.0 first before v1.1.1 testing finish because it's
> real emergency.
> if we fix and wait until v1.1.1 testing finish go production,
> that would not on time and may include other bugs in v1.1.1 ,every
> changes may casue other problems should consider.

Okay. If I understand correctly (which I'm not sure, it is hard to follow your
intentions here), then your understanding of branches and tags is different
from the one suggested by Subversion.

> branch merge conflicts I think we could resovle it by hands,
> I only worry about if we don't branch when we fix bugs in new branch.
> ex.
> 1.we fix bugs in branch v1.1.0 then tags v1.1.1
> 2.QA report bugs we fix bugs v1.1.0 too and tags v1.1.2
> 3.when we need to fix v1.1.1 is there have good way to use
> In my opinion,we can use branch v1.1.1 fix it and merge to v1.1.2
> but there is a company policy,we can't fix in tags and we can't branch
> other 1.1 version in branches

If you suddenly start changing 1.1.1 from being a tag (which is a symbolic
name for exactly one state) to being a branch (which is an independent stream
of development), then Subversion terminology does not apply. Then you are
using your own definition of what branches and tags are, and the whole
discussion that implies the terminology suggested by Subversion is moot.

You can do that, but don't ask me how braching and tagging should behave when
you yourself are making the rules. I can then only help you with the use of
Subversion, i.e. the technical part.


ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
           Visit our website at <http://www.satorlaser.de/>
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-03 13:14:35 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.