[no subject]

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

drtv narayana:~/git/evince/po$ git rebase --abort
HEAD is now at 32e9602 Updated Tamil translation


ok, so the file reverted to the untranslated version, which i verified
seeing the lines in the files.
i had worked on it in another partition and so i open that files and
copy paste the entire text.

drtv narayana:~/git/evince/po$ git commit ta.po -m "Updated Tamil translation"
Created commit 22d0c47: Updated Tamil translation
 1 files changed, 179 insertions(+), 235 deletions(-)
drtv narayana:~/git/evince/po$ git rebase --abort
No rebase in progress?
drtv narayana:~/git/evince/po$ git pull --rebase
First, rewinding head to replay your work on top of it...
Applying Updated Tamil translation
error: patch failed: po/ta.po:8
error: po/ta.po: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged po/ta.po
CONFLICT (content): Merge conflict in po/ta.po
Failed to merge in the changes.
Patch failed at 0001.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

drtv narayana:~/git/evince/po$ git rebase --abort
HEAD is now at 22d0c47 Updated Tamil translation


so i guess this belongs to "i have messed up"and so....

drtv narayana:~/git/evince/po$ git reset --hard
HEAD is now at 22d0c47 Updated Tamil translation
drtv narayana:~/git/evince/po$ git reset --hard HEAD^
HEAD is now at 32e9602 Updated Tamil translation
drtv narayana:~/git/evince/po$ git pull --rebase
First, rewinding head to replay your work on top of it...
Applying Updated Tamil translation
error: patch failed: po/ta.po:8
error: po/ta.po: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged po/ta.po
CONFLICT (content): Merge conflict in po/ta.po
Failed to merge in the changes.
Patch failed at 0001.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".



back to square one.
so i want tp remove the last commit. reading the help pages i need to
see the log.


drtv narayana:~/git/evince/po$ git log
commit 8dce1eb587532e5a0cad308be171df432c1e14d5
Author: Ivar Smolin <okul linux ee>
Date:   Sun May 24 17:25:44 2009 +0300

    Updating Estonian translation

commit c05ac2f90eae9f4a56c27a136b60fbe20f202dfe
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sat May 23 19:55:46 2009 +0200

    [libview] Add ev_view_get_area_from_mapping() to remove duplicated code

commit 25e463986a2f9b45c2218fe8d9627c43eb02afbe
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sat May 23 19:42:03 2009 +0200

    [libview] Add get_doc_point_from_location() to remove duplicated code

commit 44205a9ede6bde99d7594a9c531521540acc7e81
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sat May 23 19:13:54 2009 +0200



alas some other translations have been there.
now i should go and see it on the git repo to see what to remove?

tv
    [libdcoument] Remove all Ev*Mapping types
: