Difference between revisions of "Managing Local Changes with Mercurial Queues"

From gem5
Jump to: navigation, search
Line 4: Line 4:
 
* It discourages users from contributing back any useful changes they may develop.
 
* It discourages users from contributing back any useful changes they may develop.
 
* If a useful change is added to the source tree, it's a long, tedious process to update.
 
* If a useful change is added to the source tree, it's a long, tedious process to update.
 +
 +
If a user chooses to keep their local repository up-to-date with the source tree they typically use [http://mercurial.selenic.com/wiki/NamedBranches named branches] and merge any upstream changes into their branches.
  
 
== Mercurial Queues ==
 
== Mercurial Queues ==

Revision as of 12:39, 16 February 2013

Repository Management Problem

gem5 users typically opt to freeze their repository at a particular changeset when starting a new research project. This approach has several downsides:

  • It discourages users from contributing back any useful changes they may develop.
  • If a useful change is added to the source tree, it's a long, tedious process to update.

If a user chooses to keep their local repository up-to-date with the source tree they typically use named branches and merge any upstream changes into their branches.

Mercurial Queues