search

kenahoo / Path-Class

Cross-platform path specification manipulation
http://search.cpan.org/dist/Path-Class/
15 stars 28 forks source link

new shortcut opena(), to open a file for appending. #3

Closed karenetheridge closed 12 years ago

karenetheridge commented 12 years ago

I noticed that the commit information is getting lost when you merge from other repos - are you copying the patch rather than adding a remote spec and pulling the commit across to your repository?

git remote add ether https://github.com/karenetheridge/Path-Class.git
git merge ether/master
# OR:
git cherry-pick 33b0256
kenahoo commented 12 years ago

I'm actually just clicking on the "Merge pull request" button on github. I was assuming that actually performed the merge, does it not?

karenetheridge commented 12 years ago

I've asked around on irc of people who handle a lot of pull requests, and they say they tend to 'git fetch' from the remote URL and then cherry-pick the commit.

I'll poke around in the github docs and see why they do it so strangely; this feels like a bug (or at least a bad implementation).

karenetheridge commented 12 years ago

It looks like metadata isn't being lost after all - that was just my incorrect interpretation of what I was seeing in github's gui. When I view history with 'git log -p', the original commit that was merged is there, and then there is an empty merge commit on top - effectively behaving like 'git merge --no-ff'. So, false alarm! :)