Commits

Breadcrumbs

History for

ongit-conversion

User selector

All users

All time

Commit History

Commits on May 14, 2021

• Tweak mergeready so that it doesn't fail to reconstruct branch information when encountering non-existant branches.

  Show description for f71c775
  rjsparks

  committed
  f71c775

  Copy full SHA for f71c775

Commits on May 4, 2020

• Tweaked bin/mergeready with a hint in an error situation

  Show description for 85f3971
  levkowetz

  committed
  85f3971

  Copy full SHA for 85f3971

Commits on Mar 22, 2020

• Another tweak to bin/mergeready

  Show description for 768a4df
  levkowetz

  committed
  768a4df

  Copy full SHA for 768a4df

• Tweaked the bin/mergeready script

  Show description for 532e4d2
  levkowetz

  committed
  532e4d2

  Copy full SHA for 532e4d2

Commits on Nov 19, 2019

• Fixed a typo.

  Show description for 6070101
  levkowetz

  committed
  6070101

  Copy full SHA for 6070101

Commits on Oct 4, 2019

• Merged in [16703] from sasha@dashcare.nl:

  Show description for d798196
  levkowetz

  committed
  d798196

  Copy full SHA for d798196

Commits on Sep 3, 2019

• Merged in [16604] from rjsparks@nostrum.com:

  Show description for 506dcb3
  levkowetz

  committed
  506dcb3

  Copy full SHA for 506dcb3

Commits on Jul 31, 2019

• Tweaked mergeready, and added/changed some items in the merge support files.

  Show description for a9b9d30
  levkowetz

  committed
  a9b9d30

  Copy full SHA for a9b9d30

Commits on Jul 23, 2019

• More Py2/3 compatibility changes

  Show description for 9b415e5
  levkowetz

  committed
  9b415e5

  Copy full SHA for 9b415e5

Commits on Jul 22, 2019

• Py2/3 compatibility changes

  Show description for 3d0cca8
  levkowetz

  committed
  3d0cca8

  Copy full SHA for 3d0cca8

Commits on Dec 14, 2018

• Tweaked bin/mergeready to look also for ../ready-for-merge

  Show description for 5d87de6
  levkowetz

  committed
  5d87de6

  Copy full SHA for 5d87de6

Commits on Mar 21, 2018

• Tweaked mergeready to accept an additional hold-for-merge file outside the repository.

  Show description for 893015b
  levkowetz

  committed
  893015b

  Copy full SHA for 893015b

Commits on Mar 25, 2017

• Refined the selection of commit log info lines.

  Show description for 044b9b8
  levkowetz

  committed
  044b9b8

  Copy full SHA for 044b9b8

Commits on Dec 18, 2016

• Tweaked mergeready

  Show description for 84980e5
  levkowetz

  committed
  84980e5

  Copy full SHA for 84980e5

Commits on Dec 15, 2016

• Tweaked mergeready to use modules in working dir, and be slightly more verbose when building the mergeinfo cache.

  Show description for d6df7fb
  levkowetz

  committed
  d6df7fb

  Copy full SHA for d6df7fb

Commits on Aug 25, 2016

• Fixed a bug in the recent bin/mergeready code.

  Show description for 1d8fd6c
  levkowetz

  committed
  1d8fd6c

  Copy full SHA for 1d8fd6c

Commits on Aug 17, 2016

• Tweaked the bin/mergeready logic for showing unmerged commits ahead of commits marked ready to merge.

  Show description for 446f627
  levkowetz

  committed
  446f627

  Copy full SHA for 446f627

Commits on Aug 15, 2016

• More bin/mergeready bugfixes.

  Show description for 1dcf7b1
  levkowetz

  committed
  1dcf7b1

  Copy full SHA for 1dcf7b1

• Fixed a problem with the latest mergeready enhancement.

  Show description for 679ec63
  levkowetz

  committed
  679ec63

  Copy full SHA for 679ec63

Commits on Aug 9, 2016

• Added a check for non-merged commits ahead of commits marked as ready to merge on a branch.

  Show description for 36aedda
  levkowetz

  committed
  36aedda

  Copy full SHA for 36aedda

Commits on Jan 14, 2016

• Merged in [10684] from lars@netapp.com:

  Show description for 41c47b3
  levkowetz

  committed
  41c47b3

  Copy full SHA for 41c47b3

Commits on Nov 19, 2015

• Tweaked (normalized) how branches are expressed by bin/mergeready.

  Show description for 041532d
  levkowetz

  committed
  041532d

  Copy full SHA for 041532d

Commits on Nov 14, 2015

• Added handling for an exception which can occur in bin/mergeready if a branch with merge flags is moved, for example moving it to an attic after merge.

  Show description for cc833ef
  levkowetz

  committed
  cc833ef

  Copy full SHA for cc833ef

Commits on Nov 3, 2015

• Merged in [10379] from rjsparks@nostrum.com:

  Show description for 693badf
  levkowetz

  committed
  693badf

  Copy full SHA for 693badf

Commits on Oct 22, 2015

• Updated mergeready to work with svn 1.9, which seems to return an error for properties which aren't found.

  Show description for 6335cf5
  levkowetz

  committed
  6335cf5

  Copy full SHA for 6335cf5

Commits on Aug 27, 2015

• Added branch/iola to places checked for 'ready for merge' tags in the commit messages.

  Show description for 9c29776
  levkowetz

  committed
  9c29776

  Copy full SHA for 9c29776

Commits on Aug 10, 2015

• Merged in [9669] from olau@iola.dk:

  Show description for fb66c18
  levkowetz

  committed
  fb66c18

  Copy full SHA for fb66c18

Commits on Mar 19, 2015

• Updated the mergeready script to check if the 'test:unittest' property has been set to 'passed' on a changeset marked 'ready for merge'.

  Show description for f94b490
  levkowetz

  committed
  f94b490

  Copy full SHA for f94b490

Commits on Sep 28, 2014

• Merged in [8236] from rjsparks@nostrum.com:\n Log what rebuild_reference_relations returns to diagnose #1467.

  Show description for 1c439cd
  levkowetz

  committed
  1c439cd

  Copy full SHA for 1c439cd

Commits on Sep 16, 2014

• Added a count of pending merges to the script output.

  Show description for d633499
  levkowetz

  committed
  d633499

  Copy full SHA for d633499

Commits on Sep 1, 2014

• Added some verbosity support to the mergeready script. Added support for commits containing deleted files.

  Show description for 1adec46
  levkowetz

  committed
  1adec46

  Copy full SHA for 1adec46

Commits on May 20, 2014

• Replaced a symlink with the real file -- symlink committed by mistake.

  Show description for 82f6afb
  levkowetz

  committed
  82f6afb

  Copy full SHA for 82f6afb

Commits on May 8, 2014

• Added a utility command 'mergeready' which lists commits marked as 'Commit ready for merge' that have not yet been merged to trunk.

  Show description for e78433b
  levkowetz

  committed
  e78433b

  Copy full SHA for e78433b

Loading