separating out unwanted changes

2014-02-25 Thread James French
Hi, I wonder if someone could give me some advice on the following situation. Its probably pretty simple but my svn knowledge has dropped off a bit. An unstable dev branch was reintegrated and then a bunch of subsequent fixes were made on the mainline, mixed in with other development.

RE: separating out unwanted changes

2014-02-25 Thread Bert Huijben
: separating out unwanted changes Hi, I wonder if someone could give me some advice on the following situation. Its probably pretty simple but my svn knowledge has dropped off a bit. An unstable dev branch was reintegrated and then a bunch of subsequent fixes were made on the mainline, mixed

RE: separating out unwanted changes

2014-02-25 Thread James French
Thanks for confirming that Bert. I'd prefer to keep the trunk stable so I've recommended the reverse merge approach. From: Bert Huijben [mailto:b...@qqmail.nl] Sent: 25 February 2014 10:38 To: James French; users@subversion.apache.org Subject: RE: separating out unwanted changes That is one