Merge internal head to release_2012.02.08
Hi guys, We have checked in few internal changesets to our galaxy. Normally we did hg pull then hg merge for upgrading. With the 8 Feb release, it advice that we must do hg update release_2013.02.08 if we want to upgrade from stable branch. My understanding for hg update is, it will overwrite all local changes which we want to avoid. So in our case, what's the best way for us to upgrade? Cheers, Derrick
Derrick, The new update process outlined works with local changes the same way as the 'hg pull -u' used previously. The only difference is that it updates to a particular tag, instead of whatever is at the galaxy-dist tip. 'hg pull -u' that you've used before is actually just shorthand for doing the two common commands at once, 'hg pull; hg update'. 'update' will only discard local changes when executed with the '-C' option, otherwise it'll try to merge. If you're concerned about persisting local changes, it's probably a good idea to go ahead and commit them to your local repository or at least create a patch that you could use to recreate the changes `hg diff -p > our_local_changes.patch`. -Dannon On Mon, Feb 18, 2013 at 11:36 PM, Derrick Lin <klin938@gmail.com> wrote:
Hi guys,
We have checked in few internal changesets to our galaxy. Normally we did hg pull then hg merge for upgrading.
With the 8 Feb release, it advice that we must do hg update release_2013.02.08 if we want to upgrade from stable branch.
My understanding for hg update is, it will overwrite all local changes which we want to avoid.
So in our case, what's the best way for us to upgrade?
Cheers, Derrick
___________________________________________________________ Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
Thanks Dannon. One more tip: If you commit your changes on the default branch, you will need to merge them with stable, i.e. `hg update release_2013.02.08` followed by `hg merge <changeset_id of your local head>` --nate On Feb 19, 2013, at 7:27 AM, Dannon Baker wrote:
Derrick,
The new update process outlined works with local changes the same way as the 'hg pull -u' used previously. The only difference is that it updates to a particular tag, instead of whatever is at the galaxy-dist tip. 'hg pull -u' that you've used before is actually just shorthand for doing the two common commands at once, 'hg pull; hg update'. 'update' will only discard local changes when executed with the '-C' option, otherwise it'll try to merge.
If you're concerned about persisting local changes, it's probably a good idea to go ahead and commit them to your local repository or at least create a patch that you could use to recreate the changes `hg diff -p > our_local_changes.patch`.
-Dannon
On Mon, Feb 18, 2013 at 11:36 PM, Derrick Lin <klin938@gmail.com> wrote:
Hi guys,
We have checked in few internal changesets to our galaxy. Normally we did hg pull then hg merge for upgrading.
With the 8 Feb release, it advice that we must do hg update release_2013.02.08 if we want to upgrade from stable branch.
My understanding for hg update is, it will overwrite all local changes which we want to avoid.
So in our case, what's the best way for us to upgrade?
Cheers, Derrick
___________________________________________________________ Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
Thanks guys, I will give it a try. Cheers, D On Wed, Feb 20, 2013 at 12:40 AM, Nate Coraor <nate@bx.psu.edu> wrote:
Thanks Dannon. One more tip: If you commit your changes on the default branch, you will need to merge them with stable, i.e. `hg update release_2013.02.08` followed by `hg merge <changeset_id of your local head>`
--nate
On Feb 19, 2013, at 7:27 AM, Dannon Baker wrote:
Derrick,
The new update process outlined works with local changes the same way as the 'hg pull -u' used previously. The only difference is that it updates to a particular tag, instead of whatever is at the galaxy-dist tip. 'hg pull -u' that you've used before is actually just shorthand for doing the two common commands at once, 'hg pull; hg update'. 'update' will only discard local changes when executed with the '-C' option, otherwise it'll try to merge.
If you're concerned about persisting local changes, it's probably a good idea to go ahead and commit them to your local repository or at least create a patch that you could use to recreate the changes `hg diff -p > our_local_changes.patch`.
-Dannon
On Mon, Feb 18, 2013 at 11:36 PM, Derrick Lin <klin938@gmail.com> wrote:
Hi guys,
We have checked in few internal changesets to our galaxy. Normally we did hg pull then hg merge for upgrading.
With the 8 Feb release, it advice that we must do hg update release_2013.02.08 if we want to upgrade from stable branch.
My understanding for hg update is, it will overwrite all local changes which we want to avoid.
So in our case, what's the best way for us to upgrade?
Cheers, Derrick
___________________________________________________________ Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
participants (3)
-
Dannon Baker -
Derrick Lin -
Nate Coraor