comparison tests/test-rebase-collapse.t @ 24858:a99931201d1b stable

subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622) The '' that is used to represent the state of a not-yet-committed subrepo cannot be written to the file, because the code that parses the file splits on ' ' and expects two parts. Given that the .hgsubstate file is automatically rewritten on commit, it seems a little strange that the file is written out during a merge.
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 24 Apr 2015 23:23:55 -0400
parents aa4a1672583e
children 701df761aa94
comparison
equal deleted inserted replaced
24857:d8505bfe4825 24858:a99931201d1b