Issue35 main.py and Integrate main.py Diff
Ramiro Algozino
I was trying to see the difference between the integrate version of
the main.py file and the issue35 branch version, but my diff program
tells me that there are no lines in comun between them (?), so.. did I
break something when I started editing that file in the branch? or
something else happend (e.g. encoding has changed)?
Fortunatelly, on bare eye, there are few changes, just a pair of lines
in the Open context-dialog.
Cheers!
--
Ramiro Algozino
Andrés Gattinoni
> Hello Guys!
>
> I was trying to see the difference between the integrate version of
> the main.py file and the issue35 branch version, but my diff program
> tells me that there are no lines in comun between them (?), so.. did I
> break something when I started editing that file in the branch? or
> something else happend (e.g. encoding has changed)?
What's your diff program?
In linux you can try:
diff -rbq integrate/ issue35/
Ramiro Algozino
ramiro@lanegra:~/aranduka/src$ diff -rbq main.py /home/ramiro/main.py
Los archivos main.py y /home/ramiro/main.py son distintos
I also tried with hg diff -r integrate main.py and it returns all the
lines with "+", and with "Meld" it shows me the same..
--
Ramiro Algozino
Andrés Gattinoni
> 2011/3/7 Andrés Gattinoni <andresg...@gmail.com>:
>> On Mon, Mar 7, 2011 at 1:52 PM, Ramiro Algozino <algo...@gmail.com> wrote:
>>> Hello Guys!
>>>
>>> I was trying to see the difference between the integrate version of
>>> the main.py file and the issue35 branch version, but my diff program
>>> tells me that there are no lines in comun between them (?), so.. did I
>>> break something when I started editing that file in the branch? or
>>> something else happend (e.g. encoding has changed)?
>>
>> What's your diff program?
>>
>> In linux you can try:
>>
>> diff -rbq integrate/ issue35/
>>
>
> ramiro@lanegra:~/aranduka/src$ diff -rbq main.py /home/ramiro/main.py
> Los archivos main.py y /home/ramiro/main.py son distintos
Ok, the "r" in the command was for checking recursively between
directories (so that u could check if there were other files that
changed). The "q" is "quiet", so that it doesn't print the
differences. The "b" is to ignore whitespace.
If main.py is the only file with changes you can see which are they by doing:
diff -b main.py /home/ramiro/main.py
You can also use this bash script I coded a long time ago that
colorizes the diff output :-)
http://pastebin.com/DdfZsxyd
Andrés Gattinoni
>
> Ok, with -b worked! It shows me the difference.. thanks! but I don't
> understand what I'm doing wrong in this command: "hg diff -r integrate
> main.py" (beeing in issue35 branch), you can try it yourself..
It's probably the whitespace... you can check if hg diff -b works
Andrés Gattinoni
> 2011/3/7 Andrés Gattinoni <andresg...@gmail.com>:
> branch to ~/, the hg update integrate. With diff -b main.py ~/main.py
> I can see the difference between the 2 versions, but if I use the hg
> diff it returns me all the file lines with the "+" sign on the left..
> "hg diff -b -r issue35 main.py" on integrate branch doesn't make a
> difference for me..
Maybe because one of the main.py is not under the versioning system.
It really doesn't make much sense using Mercurial's diff to compare
with a file which is not in the repository.
Ramiro Algozino
Ok, with -b worked! It shows me the difference.. thanks! but I don't
understand what I'm doing wrong in this command: "hg diff -r integrate
main.py" (beeing in issue35 branch), you can try it yourself..
--
Ramiro Algozino
Ramiro Algozino
Sorry, I wasn't very clear.. I've copied the main.py from issue35
branch to ~/, the hg update integrate. With diff -b main.py ~/main.py
I can see the difference between the 2 versions, but if I use the hg
diff it returns me all the file lines with the "+" sign on the left..
"hg diff -b -r issue35 main.py" on integrate branch doesn't make a
difference for me..
I'll google for diff with mercurial and see if I can understand..
thank you very much Andrés!
--
Ramiro Algozino