Re: [fossil-users] Merging multi-level-branches

2010-10-19 Thread Lluís Batlle i Rossell
On Tue, Oct 19, 2010 at 08:57:27AM -0400, Richard Hipp wrote: > 2010/10/19 Lluís Batlle i Rossell > > > > > I like this behaviour intended. > > I just had the case of having a branch from trunk, and it had some changes > > I > > wanted to merge in to trunk, but I did not want all of them. So I ca

Re: [fossil-users] Merging multi-level-branches

2010-10-19 Thread Richard Hipp
2010/10/19 Lluís Batlle i Rossell > > I like this behaviour intended. > I just had the case of having a branch from trunk, and it had some changes > I > wanted to merge in to trunk, but I did not want all of them. So I can > create a > subbranch of 'branch', prepare it as I want it merged into tr

Re: [fossil-users] Merging multi-level-branches

2010-10-19 Thread Lluís Batlle i Rossell
On Sun, Oct 17, 2010 at 12:18:20PM -0400, Richard Hipp wrote: > On Sun, Oct 17, 2010 at 4:06 AM, Wolfgang wrote: > > > Hello > > > > I don't know, if the following behaviour is a feature, a bug or if this > > solution > > would be a feature request. > > > > I like to work with branches. Asuming:

Re: [fossil-users] Merging multi-level-branches

2010-10-17 Thread Richard Hipp
On Sun, Oct 17, 2010 at 4:06 AM, Wolfgang wrote: > Hello > > I don't know, if the following behaviour is a feature, a bug or if this > solution > would be a feature request. > > I like to work with branches. Asuming: > > 1. i have a trunk development, using version 1, 2, 3 > 2. i started a branch

[fossil-users] Merging multi-level-branches

2010-10-17 Thread Wolfgang
Hello I don't know, if the following behaviour is a feature, a bug or if this solution would be a feature request. I like to work with branches. Asuming: 1. i have a trunk development, using version 1, 2, 3 2. i started a branch name b1 at 1 and committed some changes 1.1.1, 1.1.2, 1.1.3 3. i s