branching and merging - Splitting out multiple intermediate changes in Mercurial -

-

we have unfortunate situation new feature branch made second, unrelated feature branch had been put on hold rather default. there's multiple changesets within both feature branches , while changed files unrelated several high level project files have edits on both branches. default has had several updates , merges during time too. thankfully intermediate feature hasn't been updated concurrently new feature. i've looked various commands , options available , lost how best fix situation. tree looks like:

default -- various edits , merges -- tip    \     \-- named branch 1 (15 changes) -- named branch 2 (30 edits)

i want point default has changes named branch 2 none named branch 1. want branch has changes named branch 1 available when return feature.

i suspect there's no nice easy way this, , there's going messy parts in history, @ loss @ how start going task.

hg graft can cherry-pick changesets 1 branch another. update destination branch, graft revisions want copy running, example:

hg graft 8 9 10

conflicts handled using normal merge process.

if use tortoisehg, select changesets graft current selected changeset, right-click , select graft selected local...:

enter image description here

result:

enter image description here


Comments

Post a Comment

Popular posts from this blog

Java 3D LWJGL collision -

-
i making 3d java game lwjgl library, , wondering how add collision detection, player not go through models. i using obj models. here objloader class, loads models: package renderengine; import java.io.bufferedreader; import java.io.file; import java.io.filenotfoundexception; import java.io.filereader; import java.util.arraylist; import java.util.list; import models.rawmodel; import org.lwjgl.util.vector.vector2f; import org.lwjgl.util.vector.vector3f; public class objloader { public static rawmodel loadobjmodel(string filename, loader loader){ filereader fr = null; try { fr = new filereader(new file("res/"+filename+".obj")); } catch (filenotfoundexception e) { system.err.println("couldn't load file!"); e.printstacktrace(); } bufferedreader reader = new bufferedreader(fr); string line; list<vector3f> vertices = new arraylist<vector3f...
Read more

methods - python can't use function in submodule -

-
my folder structure this: pythonstuff/ program.py modulea/ __init__.py foo.py bar.py here's code bar.py : def hello(): print("hello, world!") here's code program.py : #!/usr/bin/env python3 modulea import bar bar.hello() i run $ python3 program.py somehow error: file "program.py", line 3, in <module> bar.hello() attributeerror: 'module' object has no attribute 'hello' edit: __init__.py file empty. edit2: after trying realized had bar.py in root directory contained hello() method. bar.py in modulea/ directory empty. add it import os __all__ = [] module in os.listdir(os.path.dirname(__file__)): if module != '__init__.py' , module[-3:] == '.py': __all__.append(module[:-3]) the init .py files required make python treat directories containing packages; done prevent directories common name, such string, unintentionally hiding v...
Read more

c# - ErrorThe type or namespace name 'AxWMPLib' could not be found (are you missing a using directive or an assembly reference?) -

-
what possible reference handler axwmplib._wmpocxevents_playstatechangeeventhandler ? when pass event in method, private void axwindowsmediaplayer1_playstatechange(object sender,axwmplib._wmpocxevents_playstatechangeevent e) compiling throws following error: the type or namespace name 'axwmplib' not found (are missing using directive or assembly reference?) if using visual studio make sure have axwmplib listed under references in solution explorer. if have embedded windows media player control in form, should have been added automatically along wmplib . an easy way add these libraries if missing add windows media player control form (an existing 1 do). right-click on toolbox , pick "choose items..." context menu, tick "windows media player" control on "com components" tab , click ok. should have little windows media player icon attached cursor; click on form add it. add axwmplib , wmplib references solution. can delete w...
Read more