search

rlishtaba / rubyripper

Automatically exported from code.google.com/p/rubyripper
0 stars 0 forks source link

`rr_lib.rb` missing after merge #476

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago 
Doing `git remote update` and `git rebase origin/master` starting 
`bin/rubyripper_gtk2.rb` fails that `rr_lib.rb` is not available. `find` does 
also do not find it.

it looks like the merge did fail somehow.

commit a4c060d71e8f9165f17d5bcb4c48ae425cbecb22
Merge: e0502ca 4be41d9
Author: Bouke Woudstra <boukewoudstra@gmail.com>
Date:   Sun Oct 2 12:36:47 2011 +0200

    Merge branch 'stable' of https://code.google.com/p/rubyripper

    Conflicts:
        rr_lib.rb

Using

    git checkout 4be41d9d519f4029bb6f41e439ece1a53e12f7d0

i. e. reverting the merge fixes this issue for me.

Original issue reported on code.google.com by pm.deb...@googlemail.com on 4 Oct 2011 at 2:43

GoogleCodeExporter commented 8 years ago 
I had some trouble here. Git is nice if it works as expected. In this case the 
tagging went wrong somehow, and it started to merge, which I didn't wanted. 
I'll see what I can do.

Original comment by boukewou...@gmail.com on 4 Oct 2011 at 10:25

GoogleCodeExporter commented 8 years ago 
Should be fixed with ref a4c060d71e8f. At least, the file is there when I 
browse the repository online.

Original comment by boukewou...@gmail.com on 8 Oct 2011 at 9:59

GoogleCodeExporter commented 8 years ago 
http://code.google.com/p/rubyripper/source/detail?r=a4c060d71e8f9165f17d5bcb4c48
ae425cbecb22

Original comment by boukewou...@gmail.com on 8 Oct 2011 at 10:00

GoogleCodeExporter commented 8 years ago 
Seems to still be a problem:

$ bin/rubyripper_gtk2 
The main program logic file 'rr_lib.rb' can't be found!

Original comment by ha...@hawkesnest.net on 5 Nov 2011 at 4:41

GoogleCodeExporter commented 8 years ago 
Does this also happen when cloning the current repository? That would really 
surprise me, because the file is there when browsing the stable repository:
http://code.google.com/p/rubyripper/source/browse/?name=stable

Original comment by boukewou...@gmail.com on 5 Nov 2011 at 8:21

GoogleCodeExporter commented 8 years ago 
Yes, and the file doesn’t show up in 
http://code.google.com/p/rubyripper/source/browse/

Original comment by ha...@hawkesnest.net on 6 Nov 2011 at 6:28

GoogleCodeExporter commented 8 years ago 
It does when you choose the stable branch:
http://code.google.com/p/rubyripper/source/browse/?name=stable

Original comment by boukewou...@gmail.com on 7 Nov 2011 at 7:51

GoogleCodeExporter commented 8 years ago 
Which brings me to the thought, you are checking the stable branch, are you?

Original comment by boukewou...@gmail.com on 7 Nov 2011 at 7:52

GoogleCodeExporter commented 8 years ago 
I’m following the instructions on the website, at 
http://code.google.com/p/rubyripper/source/checkout

They say “Get a local copy of the rubyripper repository with this command: 
git clone https://code.google.com/p/rubyripper/”

Original comment by ha...@hawkesnest.net on 7 Nov 2011 at 7:56

GoogleCodeExporter commented 8 years ago 
If it’s documented somewhere that I should be checking out the stable branch, 
and how to do that, I’m missing it.

The wiki says to use github, the source page linked above says to clone 
https://code.google.com/p/rubyripper/, and the README says nothing at all.

Original comment by ha...@hawkesnest.net on 7 Nov 2011 at 7:58

GoogleCodeExporter commented 8 years ago 
You are right. I've updated the wiki page. Thanks for pointing it out.

Original comment by boukewou...@gmail.com on 9 Nov 2011 at 9:33