There's a good chance I'm being completely obtuse here, in which case I
apologize, but I've got a problem I can't seem to find a solution for.

 

Basically, we've got a branch structure that for all intents and
purposes looks like this:

 

Trunk

 |

 |-SP0

 |-SP1

 |-SP2 

 

Now, one of our devs, has coded some stuff into SP1 that really should
have been SP2 only, so I'd like to find a way of getting his changes
checked into SP2 without touching SP1 at all.

 

I looked into baseless merges, but they require the changes to be
checked in which defeats the object. 

 

I also looked into shelving the changes, but I can't find a way to
unshelve onto a different branch.

 

Does anyone have any idea of how to do this? 

 

Cheers,

 

Philip 

 

 

Philip Stears | Lead Developer

 

 

 

 

DriveWorks Ltd

[email protected] <mailto:[email protected]> 

http://www.driveworks.co.uk/ <http://www.driveworks.co.uk/> 

 

 

( +44 (1925) 75 75 85 Office

( +44 (7818) 03 13 75 Cell

 

 

 

--------------------------------------------------------------------------------
List address: [email protected]
Subscribe: [email protected]
Unsubscribe: [email protected]
List FAQ: http://www.codify.com/lists/oztfs
Other lists you might want to join: http://www.codify.com/lists

<<image001.jpg>>

Reply via email to