From b6bd9d0b4c9f9b86dcfc708018fa7d7ab21cc824 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Mon, 11 Aug 2014 22:29:57 +1200 Subject: [PATCH] Show what we're merging. Helps folk figure out conflicts. --- bin/prep_source_repos | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/prep_source_repos b/bin/prep_source_repos index 8ecaa82..47bb82e 100755 --- a/bin/prep_source_repos +++ b/bin/prep_source_repos @@ -118,6 +118,7 @@ def main(): ref = resolved_refs[ref] else: ref = 'refs/changes/%s' % ref + print 'merging in %s' % ref check_call(['git', 'merge', '--no-edit', ref], cwd=rd) if dirty: check_call(['git', 'stash', 'pop'], cwd=rd)