Merge two changesets?

[Jeffery Fernandez]

Hi all,

My committers keep forgetting to do a "git commit --amend" and therefore a new changeset is created with dependency to the previous changeset. Is it possible to merge two changesets? 

[Martin Fick]

No merge option yet. You should look into installing the changeid hook and perhaps enabling the option which makes changeids required.

Jeffery Fernandez <jefferyf...@gmail.com> wrote:

Hi all,

My committers keep forgetting to do a "git commit --amend" and therefore a new changeset is created with dependency to the previous changeset. Is it possible to merge two changesets? 

--
To unsubscribe, email repo-discuss...@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en

[Matthias Sohn]

2011/9/15 Jeffery Fernandez <jefferyf...@gmail.com>

Hi all,

My committers keep forgetting to do a "git commit --amend" and therefore a new changeset is created with dependency to the previous changeset. Is it possible to merge two changesets? 

Not in Gerrit but only the hard way by squashing the two commits which led to two

changesets in Gerrit:

- squash the second commit into the first one

- put the first changeset's change-id into the commit message

- re-push it to Gerrit 

- then abandon the second change.

--
Matthias

[Johan Björk]

It would be quite neat to allow gerrit to merge two changesets that depend on eachother from the UI. Anyone looked into the possibility of doing that?

/Johan

[Alex Blewitt]

On 15 Sep 2011, at 08:26, Johan Björk <p...@spotify.com> wrote:

> It would be quite neat to allow gerrit to merge two changesets that depend on eachother from the UI. Anyone looked into the possibility of doing that?

The problem is that the newly merged change would have a new commit id, and the person who pushed the changes would then have to rebase to do any further work. In essence, you're making it more difficult for them.

It's better (and easier) to prohibit pushes without a change id since it's a one time fix that solves the problem for ever instead of requiring manual intervention each time.

Alex

Sent from my iPod

[Jeffery Fernandez]

Currently, Change-Id is required for the project. If you do "git commit" instead of "git commit --amend", a new changeId is fetched from Gerrit (via the hook), thereby a new change-set being created.

[R. Tyler Croy]

Just to clarify, the commit-msg hook doesn't hit Gerrit at all. IIRC it
prepends the SHA-1 with an "I" and that's it :)

- R. Tyler Croy
--------------------------------------
Code: http://github.com/rtyler
Chatter: http://identi.ca/agentdero
http://twitter.com/agentdero