Re: stgit - continue rebase after merge conflict?

From: Alex Chiang <achiang@hp.com>
Date: Feb 28, 2008, 17:38 UTC
Message-ID: <20080228173830.GA16045@ldl.fc.hp.com>
In-Reply-To: <b0943d9e0802260856j6e9b0053ne4916149d8e4387c@mail.gmail.com>

* Catalin Marinas <catalin.marinas@gmail.com>:

Show 13 quoted lines

> On 26/02/2008, Alex Chiang <achiang@hp.com> wrote:
> >  How does one do a stg rebase if there are merge conflicts?
> 
> Basically, you solve the conflict, refresh the current patch and
> continue with 'stg push' or 'stg goto <top patch>'. The 'rebase'
> command does 'pop --all', 'git reset', 'push --all'. In your conflict,
> the base of the stack was already changed to the latest and hence only
> push/goto is needed. To fix it:
> 
> $ vi files   # or simply use 'resolved -i' below
> $ stg resolved -a [-i]
> $ stg refresh
> $ stg goto top-patch

That goto command doesn't tell you about merge conflicts:

achiang@blender:~/kernels/linux-2.6$ stg series
+ 0001-Remove-path-attribute-from-sgi_hotplug.patch

> 0002-Construct-one-fakephp-slot-per-pci-slot.patch

- 0003-Introduce-pci_slot.patch
- 0004-ACPI-PCI-slot-detection-driver.patch

achiang@blender:~/kernels/linux-2.6$ stg goto 0004-ACPI-PCI-slot-detection-driver.patch 
Pushed 0003-Introduce-pci_slot.patch (conflict)
Error: Merge conflict
Now at patch "0003-Introduce-pci_slot.patch"

achiang@blender:~/kernels/linux-2.6$ stg series
+ 0001-Remove-path-attribute-from-sgi_hotplug.patch
+ 0002-Construct-one-fakephp-slot-per-pci-slot.patch

> 0003-Introduce-pci_slot.patch

- 0004-ACPI-PCI-slot-detection-driver.patch

Since this patch series is small, I just did a 'stg push' and now it tells me about the conflicts. But I don't think I'd want to do that if I was managing tens or hundreds of patches...

achiang@blender:~/kernels/linux-2.6$ stg push --undo
Undoing push of "0003-Introduce-pci_slot.patch" ... done
Now at patch "0002-Construct-one-fakephp-slot-per-pci-slot.patch"
achiang@blender:~/kernels/linux-2.6$ stg push
Checking for changes in the working directory ... done
Pushing patch "0003-Introduce-pci_slot.patch" ... 
  CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_ibm.c
  CONFLICT (content): Merge conflict in drivers/pci/hotplug/pci_hotplug_core.c
  CONFLICT (content): Merge conflict in drivers/pci/hotplug/rpadlpar_sysfs.c
  CONFLICT (content): Merge conflict in include/linux/pci.h
  CONFLICT (content): Merge conflict in include/linux/pci_hotplug.h
  Error: The merge failed during "push".
         Revert the operation with "push --undo".
  stg push: 5 conflict(s)

Is this pilot error? Or is goto misbehaving?

Thanks.

/ac