Re: Periodically merge between trunk->branch and branch->trunk

2010-12-13 Thread Stanimir Stamenkov
Mon, 13 Dec 2010 07:33:07 +0100, /Daniel Albuschat/: > 2010/12/11 Stanimir Stamenkov : >> Thu, 9 Dec 2010 12:46:14 +0100, /Daniel Albuschat/: >> >>> Currently the only solution I see is to reintegrate the branch to >>> trunk and then re-create the branch. This has the shortcoming that all >>> devel

Re: Periodically merge between trunk->branch and branch->trunk

2010-12-10 Thread Stefan Sperling
On Fri, Dec 10, 2010 at 01:09:45PM +0100, B Smith-Mannschott wrote: > On Thu, Dec 9, 2010 at 20:27, Kris Deugau wrote: > > Daniel Albuschat wrote: > >> > >> I'd like to create a branch from trunk and periodically merge trunk > >> into my branch to stay up to date with what happens in trunk. > >> A

Re: Periodically merge between trunk->branch and branch->trunk

2010-12-10 Thread B Smith-Mannschott
On Thu, Dec 9, 2010 at 20:27, Kris Deugau wrote: > Daniel Albuschat wrote: >> >> I'd like to create a branch from trunk and periodically merge trunk >> into my branch to stay up to date with what happens in trunk. >> At some point, the feature in my branch reaches a kind of stability >> that is OK

Re: Periodically merge between trunk->branch and branch->trunk

2010-12-09 Thread Kris Deugau
Daniel Albuschat wrote: I'd like to create a branch from trunk and periodically merge trunk into my branch to stay up to date with what happens in trunk. At some point, the feature in my branch reaches a kind of stability that is OK for trunk, so I merge it back to trunk. The difference to the st

RE: Periodically merge between trunk->branch and branch->trunk

2010-12-09 Thread Ludwig, Michael
Moin Daniel, > I'd like to create a branch from trunk and periodically merge trunk > into my branch to stay up to date with what happens in trunk. > At some point, the feature in my branch reaches a kind of stability > that is OK for trunk, so I merge it back to trunk. > The difference to the stan