vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg update -C 83:fd3cceba558c^C
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg log -v -l 4
changeset:   84:271105ef3910
branch:      loadtests
tag:         master
tag:         tip
user:        Vasyl Zuzyak <zvasylvv@gmail.com>
date:        Thu Feb 24 19:44:54 2011  0200
files:       commander/Resources/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png commander/Resources/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png commander/Resources/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png commander/Resources/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png commander/Resources/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png commander/Resources/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png commander/Resources/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png commander/Resources/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png commander/Resources/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png commander/Resources/css/overcast/images/ui-icons_3383bb_256x240.png commander/Resources/css/overcast/images/ui-icons_454545_256x240.png commander/Resources/css/overcast/images/ui-icons_70b2e1_256x240.png commander/Resources/css/overcast/images/ui-icons_999999_256x240.png commander/Resources/css/overcast/images/ui-icons_fbc856_256x240.png commander/Resources/css/overcast/jquery-ui-1.8.9.custom.css commander/Resources/css/stylesheet.css commander/Resources/css/ui.jqgrid.css commander/Resources/index.html commander/Resources/js/main.js commander/Resources/js/thirdparty/grid.locale-en.js commander/Resources/js/thirdparty/jquery-ui-1.8.9.custom.min.js commander/Resources/js/thirdparty/jquery.jqGrid.min.js commander/i18n/en/strings.properties
description:
Implemented INT-2 ('View tests list')


changeset:   83:fd3cceba558c
tag:         default/master
user:        Roman Onufryk <roman@bugazza.com>
date:        Wed Feb 23 17:50:56 2011  0200
files:       docs/example_of_get_tests.json
description:
Described get-tests API


changeset:   82:1429be3a22d5
user:        Roman Onufryk <roman@bugazza.com>
date:        Wed Feb 23 17:40:25 2011  0200
files:       .gitignore base/app/.htaccess base/app/api.php
description:
Get attachment API


changeset:   81:3ea1b4370998
user:        Roman Onufryk <roman@bugazza.com>
date:        Wed Feb 23 16:25:46 2011  0200
files:       docs/example_of_create_test_request.json
description:
Changed attachments format


vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg up -C default
4 files updated, 0 files merged, 19 files removed, 0 files unresolved
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg pull
pulling from git ssh://git@github.com:appcelerator/integrity_mobile.git
importing Hg objects into Git
Counting objects: 102, done.
Compressing objects: 100% (92/92), done.
Total 102 (delta 53), reused 0 (delta 0)
importing Git objects into Hg
(run 'hg update' to get a working copy)
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg update
20 files updated, 0 files merged, 0 files removed, 0 files unresolved
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg help merge
hg merge [-P] [-f] [[-r] REV]

merge working directory with another revision

    The current working directory is updated with all changes made in the requested revision since the last common predecessor revision.

    Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further
    updates to the repository are allowed. The next commit will have two parents.

    "--tool" can be used to specify the merge tool used for file merges. It overrides the HGMERGE environment variable and your
    configuration files.

    If no revision is specified, the working directory's parent is a head revision, and the current branch contains exactly one other head,
    the other head is merged with by default. Otherwise, an explicit revision with which to merge with must be provided.

    "hg resolve" must be used to resolve unresolved files.

    To undo an uncommitted merge, use "hg update --clean ." which will check out a clean copy of the original merge parent, losing all
    changes.

    Returns 0 on success, 1 if there are unresolved files.

options:

 -f --force       force a merge with outstanding changes
 -t --tool VALUE  specify merge tool
 -r --rev REV     revision to merge

 -P --preview     review revisions to merge (no merge is performed)

use "hg -v help merge" to show global options
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg merge -r 84:271105ef3910 -P
abort: unknown revision '84:271105ef3910'!
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg merge -r 84 -P
changeset:   84:271105ef3910
branch:      loadtests
tag:         master
user:        Vasyl Zuzyak <zvasylvv@gmail.com>
date:        Thu Feb 24 19:44:54 2011  0200
summary:     Implemented INT-2 ('View tests list')

vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg merge -r 84
merging commander/Resources/js/main.js
merging commander/i18n/en/strings.properties
21 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg st
M commander/Resources/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
M commander/Resources/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
M commander/Resources/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
M commander/Resources/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
M commander/Resources/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
M commander/Resources/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
M commander/Resources/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
M commander/Resources/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
M commander/Resources/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
M commander/Resources/css/overcast/images/ui-icons_3383bb_256x240.png
M commander/Resources/css/overcast/images/ui-icons_454545_256x240.png
M commander/Resources/css/overcast/images/ui-icons_70b2e1_256x240.png
M commander/Resources/css/overcast/images/ui-icons_999999_256x240.png
M commander/Resources/css/overcast/images/ui-icons_fbc856_256x240.png
M commander/Resources/css/overcast/jquery-ui-1.8.9.custom.css
M commander/Resources/css/stylesheet.css
M commander/Resources/css/ui.jqgrid.css
M commander/Resources/index.html
M commander/Resources/js/main.js
M commander/Resources/js/thirdparty/grid.locale-en.js
M commander/Resources/js/thirdparty/jquery-ui-1.8.9.custom.min.js
M commander/Resources/js/thirdparty/jquery.jqGrid.min.js
M commander/i18n/en/strings.properties
? base/app/config.php
? base/app/list.php
? commander/Resources/js/thirdparty/jquery.tmplPlus.min.js
? commander/i18n/en/strings.xml
? commander/manifest.orig
? notes
? scout/Resources/app.jss
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg ci

[1]   Stopped                 hg ci
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg heads
changeset:   98:66fa2a2dc17d
tag:         default/master
tag:         tip
parent:      94:ffcf60d109c1
parent:      97:0bb5446282db
user:        Andrew Kulinich <andrew@4vanger.com>
date:        Thu Feb 24 19:02:14 2011  0200
summary:     Merge branch 'master' of github.com:appcelerator/integrity_mobile

changeset:   84:271105ef3910
branch:      loadtests
tag:         master
user:        Vasyl Zuzyak <zvasylvv@gmail.com>
date:        Thu Feb 24 19:44:54 2011  0200

summary:     Implemented INT-2 ('View tests list')

vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg help revert
hg revert [OPTION]... [-r REV] [NAME]...

restore individual files or directories to an earlier state

    Note:
       This command is most likely not what you are looking for. Revert will partially overwrite content in the working directory without
       changing the working directory parents. Use "hg update -r rev" to check out earlier revisions, or "hg update --clean ." to undo a
       merge which has added another parent.

    With no revision specified, revert the named files or directories to the contents they had in the parent of the working directory. This
    restores the contents of the affected files to an unmodified state and unschedules adds, removes, copies, and renames. If the working
    directory has two parents, you must explicitly specify a revision.

    Using the -r/--rev option, revert the given files or directories to their contents as of a specific revision. This can be helpful to
    "roll back" some or all of an earlier change. See "hg help dates" for a list of formats valid for -d/--date.

    Revert modifies the working directory. It does not commit any changes, or change the parent of the working directory. If you revert to a
    revision other than the parent of the working directory, the reverted files will thus appear modified afterwards.

    If a file has been deleted, it is restored. If the executable mode of a file was changed, it is reset.

    If names are given, all files matching the names are reverted. If no arguments are given, no files are reverted.

    Modified files are saved with a .orig suffix before reverting. To disable these backups, use --no-backup.

    Returns 0 on success.

options:

 -a --all                  revert all changes when no arguments given
 -d --date DATE            tipmost revision matching date
 -r --rev REV              revert to the specified revision
    --no-backup            do not save backup copies of files
 -I --include PATTERN [ ]  include names matching the given patterns
 -X --exclude PATTERN [ ]  exclude names matching the given patterns
 -n --dry-run              do not perform actions, just print output

[ ] marked option can be specified multiple times

use "hg -v help revert" to show global options
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg revert -a
abort: uncommitted merge - please provide a specific revision
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg revert -a -r 98
waiting for lock on working directory of /home/vv/work/appcelerator/sources/integrity_mobile.hg held by 'crusader:12013'
^Cinterrupted!
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ fg
hg ci
abort: empty commit message
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg revert -a
abort: uncommitted merge - please provide a specific revision
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg revert -a -r 98
removing css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
removing css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
removing css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
removing css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
removing css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
removing css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
removing css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
removing css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
removing css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
removing css/overcast/images/ui-icons_3383bb_256x240.png
removing css/overcast/images/ui-icons_454545_256x240.png
removing css/overcast/images/ui-icons_70b2e1_256x240.png
removing css/overcast/images/ui-icons_999999_256x240.png
removing css/overcast/images/ui-icons_fbc856_256x240.png
removing css/overcast/jquery-ui-1.8.9.custom.css
reverting css/stylesheet.css
removing css/ui.jqgrid.css
reverting index.html
reverting js/main.js
removing js/thirdparty/grid.locale-en.js
removing js/thirdparty/jquery-ui-1.8.9.custom.min.js
removing js/thirdparty/jquery.jqGrid.min.js
reverting ../i18n/en/strings.properties
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg st
M commander/Resources/css/stylesheet.css
M commander/Resources/index.html
M commander/Resources/js/main.js
M commander/i18n/en/strings.properties
R commander/Resources/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
R commander/Resources/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
R commander/Resources/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
R commander/Resources/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
R commander/Resources/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
R commander/Resources/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
R commander/Resources/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
R commander/Resources/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
R commander/Resources/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
R commander/Resources/css/overcast/images/ui-icons_3383bb_256x240.png
R commander/Resources/css/overcast/images/ui-icons_454545_256x240.png
R commander/Resources/css/overcast/images/ui-icons_70b2e1_256x240.png
R commander/Resources/css/overcast/images/ui-icons_999999_256x240.png
R commander/Resources/css/overcast/images/ui-icons_fbc856_256x240.png
R commander/Resources/css/overcast/jquery-ui-1.8.9.custom.css
R commander/Resources/css/ui.jqgrid.css
R commander/Resources/js/thirdparty/grid.locale-en.js
R commander/Resources/js/thirdparty/jquery-ui-1.8.9.custom.min.js
R commander/Resources/js/thirdparty/jquery.jqGrid.min.js
? base/app/config.php
? base/app/list.php
? commander/Resources/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png.orig
? commander/Resources/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png.orig
? commander/Resources/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png.orig
? commander/Resources/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png.orig
? commander/Resources/css/overcast/images/ui-icons_3383bb_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_454545_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_70b2e1_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_999999_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_fbc856_256x240.png.orig
? commander/Resources/css/overcast/jquery-ui-1.8.9.custom.css.orig
? commander/Resources/css/stylesheet.css.orig
? commander/Resources/css/ui.jqgrid.css.orig
? commander/Resources/index.html.orig
? commander/Resources/js/main.js.orig
? commander/Resources/js/thirdparty/grid.locale-en.js.orig
? commander/Resources/js/thirdparty/jquery-ui-1.8.9.custom.min.js.orig
? commander/Resources/js/thirdparty/jquery.jqGrid.min.js.orig
? commander/Resources/js/thirdparty/jquery.tmplPlus.min.js
? commander/i18n/en/strings.properties.orig
? commander/i18n/en/strings.xml
? commander/manifest.orig
? notes
? scout/Resources/app.jss
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg up
abort: outstanding uncommitted merges
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ hg revetr commander/Resources/js/thirdparty/jquery.jqGrid.min.js
hg: unknown command 'revetr'
Mercurial Distributed SCM

basic commands:

 add        add the specified files on the next commit
 annotate   show changeset information by line for each file
 clone      make a copy of an existing repository
 commit     commit the specified files or all outstanding changes
 diff       diff repository (or selected files)
 export     dump the header and diffs for one or more changesets
 forget     forget the specified files on the next commit
 init       create a new repository in the given directory
 log        show revision history of entire repository or files
 merge      merge working directory with another revision
 pull       pull changes from the specified source
 push       push changes to the specified destination
 remove     remove the specified files on the next commit
 serve      start stand-alone webserver
 status     show changed files in the working directory
 summary    summarize working directory state
 update     update working directory (or switch revisions)

use "hg help" for the full list of commands or "hg -v" for details
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander/Resources $ cd ../
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg/commander $ cd ../
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $ hg revert commander/Resources/js/thirdparty/jquery.jqGrid.min.js
abort: uncommitted merge - please provide a specific revision
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $ ^C
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $ hg st
M commander/Resources/css/stylesheet.css
M commander/Resources/index.html
M commander/Resources/js/main.js
M commander/i18n/en/strings.properties
R commander/Resources/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
R commander/Resources/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
R commander/Resources/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
R commander/Resources/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
R commander/Resources/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
R commander/Resources/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
R commander/Resources/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
R commander/Resources/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
R commander/Resources/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
R commander/Resources/css/overcast/images/ui-icons_3383bb_256x240.png
R commander/Resources/css/overcast/images/ui-icons_454545_256x240.png
R commander/Resources/css/overcast/images/ui-icons_70b2e1_256x240.png
R commander/Resources/css/overcast/images/ui-icons_999999_256x240.png
R commander/Resources/css/overcast/images/ui-icons_fbc856_256x240.png
R commander/Resources/css/overcast/jquery-ui-1.8.9.custom.css
R commander/Resources/css/ui.jqgrid.css
R commander/Resources/js/thirdparty/grid.locale-en.js
R commander/Resources/js/thirdparty/jquery-ui-1.8.9.custom.min.js
R commander/Resources/js/thirdparty/jquery.jqGrid.min.js
? base/app/config.php
? base/app/list.php
? commander/Resources/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png.orig
? commander/Resources/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png.orig
? commander/Resources/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png.orig
? commander/Resources/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png.orig
? commander/Resources/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png.orig
? commander/Resources/css/overcast/images/ui-icons_3383bb_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_454545_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_70b2e1_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_999999_256x240.png.orig
? commander/Resources/css/overcast/images/ui-icons_fbc856_256x240.png.orig
? commander/Resources/css/overcast/jquery-ui-1.8.9.custom.css.orig
? commander/Resources/css/stylesheet.css.orig
? commander/Resources/css/ui.jqgrid.css.orig
? commander/Resources/index.html.orig
? commander/Resources/js/main.js.orig
? commander/Resources/js/thirdparty/grid.locale-en.js.orig
? commander/Resources/js/thirdparty/jquery-ui-1.8.9.custom.min.js.orig
? commander/Resources/js/thirdparty/jquery.jqGrid.min.js.orig
? commander/Resources/js/thirdparty/jquery.tmplPlus.min.js
? commander/i18n/en/strings.properties.orig
? commander/i18n/en/strings.xml
? commander/manifest.orig
? notes
? scout/Resources/app.jss
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $ ^C
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $
vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $ hg heads
changeset:   98:66fa2a2dc17d
tag:         default/master
tag:         tip
parent:      94:ffcf60d109c1
parent:      97:0bb5446282db
user:        Andrew Kulinich <andrew@4vanger.com>
date:        Thu Feb 24 19:02:14 2011  0200
summary:     Merge branch 'master' of github.com:appcelerator/integrity_mobile

changeset:   84:271105ef3910
branch:      loadtests
tag:         master
user:        Vasyl Zuzyak <zvasylvv@gmail.com>
date:        Thu Feb 24 19:44:54 2011  0200
summary:     Implemented INT-2 ('View tests list')

vv@crusader ~/work/appcelerator/sources/integrity_mobile.hg $