Re: quick-view line-wrap bug.

2010-01-09 Thread Janek Kozicki
Andrew Borodin said: (by the date of Thu, 07 Jan 2010 09:53:59 +0300)

 Thanks for the bugreport. I've created a ticket:
 http://www.midnight-commander.org/ticket/1944

how can I download this? Forgive me my git ignorance.

I tried (again) to 

http://www.midnight-commander.org/changeset/8c84095ae1afc1f60eb1cb73e318cf315ac77a9c
Download in other formats: Unified Diff


You will probably tell me to switch branch. But I already switched,
because I need to use this patch:

git checkout -b 1918_quick_view_corruption origin/1918_quick_view_corruption

How can I use both patches at the same time?
-- 
Janek Kozicki
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel


Re: quick-view line-wrap bug.

2010-01-09 Thread Andrew Borodin
On Sat, 9 Jan 2010 13:10:05 +0100 Janek Kozicki wrote:
 Andrew Borodin said: (by the date of Thu, 07 Jan 2010 09:53:59 +0300)
 
  Thanks for the bugreport. I've created a ticket:
  http://www.midnight-commander.org/ticket/1944
 
 how can I download this? Forgive me my git ignorance.

You already have the git repo, don't you? Do following commands:

# 1. Remove modified file from current working directory
git reset --hard
# 2. Switch to the master branch:
git checkout master
# 3. Update repo:
git pull
# 4. Get new branch:
git checkout -b 1944_empty_line_in_wrapped_line 
origin/1944_empty_line_in_wrapped_line

 You will probably tell me to switch branch. But I already switched,
 because I need to use this patch:
 
 git checkout -b 1918_quick_view_corruption origin/1918_quick_view_corruption
 
 How can I use both patches at the same time?

The 1918_quick_view_corruption branch already merged to the master one.
so you don't need it. 1944_empty_line_in_wrapped_line branch includes
patches of 1918_quick_view_corruption one.

-- 
Andrew
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel