Re: Partially reintegrate changes

2010-02-18 Thread Rob van Oostrum
On Thu, Feb 18, 2010 at 1:42 PM, Jacob Weber wrote: > Stein Somers: > > I see some self-refenertial mergeinfo in our /trunk, after lots of > > merges to and from. Maybe I explicitly added it with a record-only in > > some state of confusion. But it doesn't scare me at all. It would only > > matte

Re: Partially reintegrate changes

2010-02-18 Thread Jacob Weber
Stein Somers: > I see some self-refenertial mergeinfo in our /trunk, after lots of > merges to and from. Maybe I explicitly added it with a record-only in > some state of confusion. But it doesn't scare me at all. It would only > matter if you explicitly merged /trunk to /trunk. And then, as far

Re: Partially reintegrate changes

2010-02-18 Thread Stein Somers
Maybe the self-referential mergeinfo I saw was being introduced some other way. I see some self-refenertial mergeinfo in our /trunk, after lots of merges to and from. Maybe I explicitly added it with a record-only in some state of confusion. But it doesn't scare me at all. It would only matte

Re: Partially reintegrate changes

2010-02-18 Thread Tyler Roscoe
On Thu, Feb 18, 2010 at 08:20:10AM -0800, Jacob Weber wrote: > > On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: > >> Let's say I have a branch where I develop two features, X and Y. I then > >> want to merge only X back > >> into the trunk. I want to do some further development on Y, and mer

Re: Partially reintegrate changes

2010-02-18 Thread Jacob Weber
On Feb 18, 2010, at 7:37 AM, Mark Phippard wrote: > On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: >> Let's say I have a branch where I develop two features, X and Y. I then want >> to merge only X back >> into the trunk. I want to do some further development on Y, and merge it >> into tr

Re: Partially reintegrate changes

2010-02-18 Thread Mark Phippard
On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: > Let's say I have a branch where I develop two features, X and Y. I then want > to merge only X back > into the trunk. I want to do some further development on Y, and merge it into > trunk later. > > Is this possible with Subversion? Yes. Wh