gistfile1.txt

live server:

> hg pull
> hg branch
default
> hg merge develop
36 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
> hg ci -m "merged develop - should fix the bugs"
created new head (!?)
> hg heads 

2970[tip]:2916,2969   d81bd91d5db2   2013-03-21 10:24 -0400   gregory
  merged develop - hopefully this will fix some bugs

2969   417d2a852997   2013-03-21 04:28 +0400   dmitriy
  Removed 'behavior' css3pie property from css rules and made separate UI-ie.css files with that 'behavior' property.

...

> hg push (to default)

http authorization required
realm: Qbix repositories
user: ***
password: ***
pushing to http://repo.qbix.com/Q
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)

> hg pull

added 1 changesets with 0 changes to 0 files

> hg up -C

0 files updated, 0 files merged, 0 files removed, 0 files unresolved



ON MY OWN MACHINE I FINALLY DID IT PROPERLY:


> hg pull

added 7 changesets with 6 changes to 4 files (+1 heads)

> hg up -C default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

> hg merge develop
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)

> hg ci -m "merged develop - hopefully this will fix the bugs"

> hg push



BACK ON THE LIVE SERVER:

> hg pull
added 1 changesets with 0 changes to 0 files

> hg up -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

> hg log

2971[tip]:2967,2969   3c779bf0f46f   2013-03-21 10:25 -0400   gregory
  merged develop - hopefully this will fix the bugs

2970:2916,2969   d81bd91d5db2   2013-03-21 10:24 -0400   gregory
  merged develop - hopefully this will fix some bugs

2969   417d2a852997   2013-03-21 04:28 +0400   dmitriy
  Removed 'behavior' css3pie property from css rules and made separate UI-ie.css files with that 'behavior' property.


QUESTIONS:
1) WHAT JUST HAPPENED??????
2) HOW DO I GET RID OF 2970, ALL I WANT IS FOR THE LIVE ENVIRONMENT TO HAVE WHAT MY LOCAL ONE HAS... BUT I DONT WANT TO RE-CLONE BECAUSE I HAVE UNTRACKED FILES THAT WERE SAVED BY THE SERVER in the files/ DIR