David Bremner <[email protected]> writes:
> I did notice that merging was noticably noisier than I remembered.
>
Hmm. I just noticed hit another problem with merge. I have a local
commit that deletes a couple tags; when I attempt to merge I get
complaints about local changes to files.
error: Your local changes to the following files would be overwritten by merge:
tags/[email protected]/needs-review
tags/[email protected]/needs-review
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
File "/home/bremner/config/scripts/nmbug", line 766, in <module>
args.func(**kwargs)
File "/home/bremner/config/scripts/nmbug", line 437, in merge
wait=True)
File "/home/bremner/config/scripts/nmbug", line 210, in _git
return _spawn(args=args, **kwargs)
File "/home/bremner/config/scripts/nmbug", line 193, in _spawn
args=args, status=status, stdout=stdout, stderr=stderr)
__main__.SubprocessError: ['git', '--git-dir', '/home/bremner/.nmbug',
'merge', '@{upstream}'] exited with 128
Calling the perl version of nmbug successfully creates a little
diamond merge
_______________________________________________
notmuch mailing list
[email protected]
http://notmuchmail.org/mailman/listinfo/notmuch
