pombreda / formalchemy

Automatically exported from code.google.com/p/formalchemy
MIT License
0 stars 0 forks source link

Pull request from abourget's repository #137

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago
I've committed several small updates.

I'd really love if they were in the trunk.  All tests pass, docs have been 
written for previous commits as well as the new ones.

I'm open to discussion.

Thanks

http://code.google.com/r/bourgetalexandre-formalchemy-patches/

Original issue reported on code.google.com by bourget....@gmail.com on 14 Mar 2010 at 2:06

GoogleCodeExporter commented 9 years ago
mostly merged. just got problem with -r 777 (.configure stuff). can't get test 
pass

rev 776 should be ignore ?

Original comment by gael.pas...@gmail.com on 14 Mar 2010 at 11:30

GoogleCodeExporter commented 9 years ago
Hmmm.. I probably screwed things up when reverting changes about the .configure 
stuff.

Normally, the only things I wanted merge are those listed here:

  http://code.google.com/r/bourgetalexandre-formalchemy-patches/source/list

The 776 and 777 aren't showed there, but I don't understand why they're getting 
in 
your branch.  I'm pretty new to Mercurial, any hint to fix this would be 
appreciated.

Thanks

Original comment by bourget....@gmail.com on 15 Mar 2010 at 2:33

GoogleCodeExporter commented 9 years ago
that's just because you have created new heads. it's not a problem. I've used 
hg backout  
to "forget" revs then hg merge to keep heads clean.

You should use hg pull -u from fa's repository before adding new changesets

Btw I've forget that revs numbers are locals. Only changesets ids are uuids

So I guess this issue is closed 

Original comment by gael.pas...@gmail.com on 15 Mar 2010 at 1:11