search

dusty-phillips / gitifyhg

Tools for using git as a client to mercurial repositories
GNU General Public License v3.0
62 stars 17 forks source link

Test the remote branch/bookmark naming more reliably #34

Closed dusty-phillips closed 11 years ago

dusty-phillips commented 11 years ago

I think these two problems are a function of the same basic problem:

  1. I am getting some bizarre bookmarks automatically created that I think should not be.
  2. when I push to master, gitifyhg tells me I am creating a new branch.

I'm pretty sure refs just aren't being listed correctly all the time.

As part of 1, I think I'll want to remove references to the default branch altogether and enforce that master always maps to default. Therefore there should be no bookmarks/master or branches/default ref.

In addition, my gitk output is showing separate refs for remotes/origin and hg/origin. With so many refs meaning the same thing, the gitk/qgit viewer is hard to read.

dusty-phillips commented 11 years ago

The commits listed above help eliminate all references to branches/default, but there is still a mysterious bookmarks/master that is required for everything to work correctly internally. I have to admit I don't completely understand my own code... or maybe it's felipec's code!