Help needed with syncing orchard fork to 1.4

Topics: Customizing Orchard, General, Troubleshooting
Mar 1, 2012 at 9:00 AM
Edited Mar 1, 2012 at 9:17 AM

I have a fork of orchard @ http://orchard.codeplex.com/SourceControl/network/forks/AimOrchard/AimOrchard?branch=1.x with our custom changes.

I wish to update this now so that I'm in sync with the orchard 'trunk' (default branch) and retains our custom changes, but I just can't figure out how to do it :s

Help on this would be greatly appreciated!

Edit: Looks like I got further, going to commit soon see what it'll do ;p

Edit(2): Could anyone please look at http://orchard.codeplex.com/SourceControl/network/forks/AimOrchard/AimOrchard?branch=default and tell me if that looks ok?

Developer
Mar 1, 2012 at 2:33 PM

It looks OK to me, a the files that were modified with 1.4 got overwritten (although the number of changes seem a bit small). Actually how have you done that?

Mar 1, 2012 at 2:36 PM

Mix of pulling from the orchard repo, merging with its 'default' (into my 1.x), then hg update to my 'default' and finally hg merge with my '1.x'

At least, I think that's what I did :s

Developer
Mar 1, 2012 at 7:27 PM

I see, thanks.