chiark / gitweb /
~ianmdlvl / dgit.git / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git-debrebse: merge handling: Handle absence of patches via $any
2018-08-12 Ian Jacksongit-debrebase: merge: conflict: Some xxx's now done
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: test conflict: Test resolution...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: Actually use merge resolutions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: Actually record merge resolutions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: scrap works properly when it does only...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: test conflict: Break out no-wreckage
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: Change wreckage to refs/debrebase...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian JacksonDgit.pm: Move reflog_cache_* from dgit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian JacksonDgit.pm: Move $maindir* up the file.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian JacksonDgit.pm: Move make_commit_text from dgit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: New record-resolved-merge subcommand...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Split off merge_series_patchqueue_convert
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Record the new-base in the wreckage.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Use a fresh branch and check...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce $merged_pq
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Use a couple of globals instead
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce merge_attempt_cmd global
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Do wreckage cleaning separately
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: fresh_workarea: Support $subdir
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Prettify subprocess failures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test gdr-merge-conflicts: Test...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test gdr-merge-conflicts: Break...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Minor style and error message...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Call merge_failed in merge_series
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Defeat evals which might try...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Save wreckage in $maindir
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Always save wreckage
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Drop check of no...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Check wreckage tidying
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Wreckage: tidy it up on successful...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Break out merge_wreckage_cleaning...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Check wreckage saving
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Save wreckage if desired
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce new merge_failed sub
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Make mwrecknote call printdebug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Miscellaneous mwrecknote fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: Break out run_ref_updates_now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: failmsg: Remove all double newlines, not just...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: gdr-merge test: Test an early...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksontest suite: Set DEBFULLNAME
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce global mwrecknote sub
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: gdr-merge-conflicts test: New...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: gdr-merge test: sort out section...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Do not crash on branches with...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: Do not bail making patches if there...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test: Introduce t-merge-conflicted-*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test: Drop stuff cloned from...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Add wreck note recording to merge_series
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Clarify an internal commit message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Break out $mdebug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Pass wreckage hashref to merge_series
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce $mwrecknote in walk...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Whitespace changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Refactor interchange merge-base...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Fix a $nomerge message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Add a comment about rewriting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Remove a redundant check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: mergedbreakwaters_anchor: Check...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Avoid needlessly walking MergedBreakwaters
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Use t-ref-same-start
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: test avoiding re...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Avoid asking user to re-merge...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Do a bit more testing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksontest suite: lib-gdr: t-gdr-good: Handle MergedBreakwaters
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Add another xxx comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: walk: Reintroduce the local $read_tree_upstre...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Get debian/ parts of new patch...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: read_tree_upstream: New $tree_with_debian...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Generate some more debugging...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: keycommits: Handle merged-breakwater...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: keycommits: New $claimed_bw optional...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Generate merged-breakwaters with...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: keycommits: Break out $found_anchor
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksontest suite: lib-gdr: t-gdr-good: Introduce t-gdr-analyse
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksontest suite: lib-gdr: t-gdr-good: Introduce $anal
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Check that merge resolution is...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Comment about laundry of merge...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Improve some xxx comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Test both with and...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Do not sometimes drop the first...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: Set $debugcmd_when_debuglevel = 2
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: printdebug: Selectively print $debugprefix...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: printdebug: Strip empty strings from @_ and...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: printdebug: Break apart the print
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: printdebug: Refactor slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: Reverse argumennts to check diff error...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: Add a lot of printdebug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: Introduce $debugcmd_when_debuglevel
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: Introduce $printdebug_when_debuglevel
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Detect octopi later
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Add an xxx
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: test suite: New gdr-merge test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: New merge handing, experimental and...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: read_tree_upstream: New option $keep_patches
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-10 Ian Jacksongit-debrebase: Improve ffq head recording message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-10 Ian Jacksontest suite: gitattributes: Change a comment from xxx...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-10 Ian Jacksondgit: Fix a spelling error `$merginputs' to `$mergeinputs'
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-10 Ian Jacksondgit: Drop an obsolete xxx comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-10 Ian Jacksongit-debrebase: Make read_tree_upstream global (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-10 Ian Jacksongit-debrebase: Make read_tree_debian global (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
next
Unnamed repository; edit this file 'description' to name the repository.