Search Results

Search found 3222 results on 129 pages for 'mercurial queue'.

Page 14/129 | < Previous Page | 10 11 12 13 14 15 16 17 18 19 20 21  | Next Page >

• Mercurial: how to apply the hg forget command to an entire directory

  - by SaM

  My directory structure is as follows Project -- .hg -- src -- tests When I ran hg init on the Project path, everything got added into the repo. However, inside src, there are directories like bin and obj which I'd not like to track. How do I exclude them now? I've tried hg forget src\bin - it says path not found. Please guide.

  Read the article

• Is the mercurial default glob matching syntax configurable?

  - by ataylor

  To run a command on a single file, I recently realized I can do this: hg log relglob:UniqueFilename instead of: hg log some/really/deep/directory/hierarchy/UniqueFilename I'd like to take this one step further and make relglob the default matching syntax. Is this possible?

  Read the article

• Mercurial: Remove changeset from remote branch

  - by Miguel Ping

  Hi, Is there a way to remove a from a remote changeset, or to remove an entire changeset? I accidentely pushed a .war file to a remote repo and I want to remove it. Thanks

  Read the article

• What to ignore in a Mercurial .hgignore for a Ruby on Rails app

  - by Sly

  I created a hello world app with rails HelloWorld command. I ended up with many directories: app config db doc lib log public script test tmp vendor Should all this be under sources control? What would be a good default .hgignore file for a Ruby on Rails app folder?

  Read the article

• [mercurial] Prevent "hg status" from showing everything under untracked directories

  - by Wei Hu

  I find the output of hg status too verbose for untracked directories. Suppose I have an empty repository that's managed by both git and hg. So there would be two directories, .git and .hg. The output of git status is: # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .hg/ The output of hg status is: ? .git/HEAD ? .git/config ? .git/description ? .git/hooks/applypatch-msg.sample ? .git/hooks/commit-msg.sample ? .git/hooks/post-commit.sample ? .git/hooks/post-receive.sample ? .git/hooks/post-update.sample ? .git/hooks/pre-applypatch.sample ? .git/hooks/pre-commit.sample ? .git/hooks/pre-rebase.sample ? .git/hooks/prepare-commit-msg.sample ? .git/hooks/update.sample ? .git/info/exclude Is there a way to reduce its output to something like the following line? ? .git/

  Read the article

• unknown parent error in mercurial

  - by matthewb

  I am getting a error that is preventing me to pull, even force pull. hg command error: transaction abort! rollback completed abort: data/assets/images/skins/file/skin.jpg.i@0727c4489edc: unknown parent! Is there anyway to remove, revert or fix just this file, its not even used, and it's preventing any pulling.

  Read the article

• Migrating svn repo with non-flat branch hierarchy to mercurial

  - by Assaf Lavie

  Is there a conversion utility from svn to hg that can deal with a branch hierarchy that's more complex than just a flat list of branches under /branches? My repository has a directory that looks (conceptually) like this: /branches /projectA /v1.x /v1.1 /v1.2 etc.. IOW I need a tool that can get a tree structure as input that represents the branch hierarchy, and migrate this into hg (could be flat in HG, don't really care).

  Read the article

• How do I combine multiple changelog / commit entries in mercurial

  - by Kimvais

  I currently have a repository, where development work has been committed directly into the 'default' branch. I'd like to find a way to combine multiple small changesets into a single changeset, for merging the changes to child repositories. E.g in the default/main repo there are changesets something like: 12839: Fooed the bar 12838: Fixed blonking 12837: Trumped slamdunks ... 323: Started development for thingamajiks and I would like this to look like (in the child repos): 323: Added thingamajik functionality

  Read the article

• Mercurial/Intellij9 hg4idea Error: cannot update with applied MQ patches, please use rebase

  - by johnrock

  I am getting the following error when trying to update my project from Intellij 9 using hg4idea: Error: cannot update with applied MQ patches, please use rebase What does this mean? I have not created or applied any patches as far as I know. I can pull changes from my remote repository but cannot update the project from within Intellij. I can call hg update from the command line and that works fine. Thanks

  Read the article

• mercurial: less duplication in hgrc file

  - by zaharpopov

  Hi there. I have using Hg for some projects on my google code hosting. For each projects I set in [auth] section of .hgrc the username/password to push without every asking for password. But it is lots of duplication like: [auth] proj1.prefix = ... 111 proj1.username = google code username proj1.password = google code password proj2.prefix = ... 222 proj2.username = google code username proj2.password = google code password Can this somehow be doing with less duplications? Maybe set variable in hgrc and refer to it from all username/password lines? Thanks in advance for your help

  Read the article

• Simple bad merge scenario in mercurial

  - by user281180

  I have created a repository AAA and another BBB. In AAA I have created a file A with the values a1, a2, a3 and commit In BBB I have created a file B with the values b1, b2, b3, commit and export a bundle. I add the bundle in AAA and merge. I make a change in B, and write b33 in AAA and another change in B and write b23 in BBB. and commit both. I create bundle of BBB and add the bundle in AAA. I do a merge. Now I decide to revert to the revert to step 2. I no more want to have the merge of 4. changes done in B as they were bad merges. Now I want to add the bundle of 3 but I can see that it can`t see any changes anymore. Why? How can I do the merge once more?

  Read the article

• Mercurial: What is the benefit of fixing errors in earlier versions

  - by Ken Earley

  According to the guide, under the heading: Fixing errors in earlier revisions, it states this: When you find a bug in some earlier revision you have two options: either you can fix it in the current code, or you can go back in history and fix the code exactly where you did it, which creates a cleaner history. How does going back in history make it cleaner? It still makes a new changeset at tip. Does it have something to do with what is recorded as it's parent? Is there a way to view the logs seeing the newly inserted changeset in that order? This lesson is under the main heading of Lone developer with nonlinear history. Is this good practice when working on a team?

  Read the article

• Pulling changes between two separate Mercurial repositories

  - by Rob

  I have two versions of a product and am using separate Hg repositories for each. I have made a change to one (v1.0) and I want to pull just that change into the v2.0 repository. How do I go about this? As far as I can tell, using hg pull -f -r xxxxx \\server\hg\v1.0 will pull in all changes up to the specified revision which isn't what I want. Is this possible or will I have to add the fix by hand?

  Read the article

• Getting rid of a dangling changeset after rebase in mercurial

  - by steglig

  Hi, I did a hg update --force <repo> to get another seemingly unrelated repository into the current one. Afterwards I merged the first changeset of the other repo (to get renamings "right"). A rebase of the other repository starting from the second changeset left the first changeset (here: revision 5431) dangling in the repository: o changeset: 5433:68c67c7e0bbb | o changeset: 5432:331ee440893a |\ | | | o changeset: 5431:1023b4c44f18 | o changeset: 5430:15aff858ec36 To clean things up I'd like to get rid of revision 5431. How would I do that? Thanks.

  Read the article

• Mercurial: Diff current source vs source at point in time

  - by Marcus

  I know how to view all changes in a changeset.. But let's say you update your source, you do a pull and you get 3 new changesets. How can you compare the current state of the remote repository (with the 3 changesets checked in) vs. the current source (on your local machine)? I'd like to do this using the visual diff tool which I currently have configured (Examdiff or Kdiff3).

  Read the article

• preserving history when using mercurial ontop of clearcase

  - by Arthur Ulfeldt

  I work in a ClearCase shop and CC does a good job of integrating the team's work though our code review process prevents me from using it to track my daily changes. Creating an hg repository on top of my CC view works really well. I can track my changes and easily make backups on the file server, produce diffs for people etc. This is all well and good until I move to a new CC view and have to leave my history behind. I would love to be able to ?pull? my previous history in and have everything that's different in the new view show up as the latest change set.

  Read the article

• Mercurial merge strategy per file type

  - by dls

  All: I want to use kdiff to merge all files with a certain suffix (say *.c, *.h) and I want to do two things (turn off premerge and use internal:other) for all files with another suffix (say *.mdl). The purpose of this is to allow me to employ a type of 'clobber merge' for a specific file type (ie: un-mergable files like configurations, auto-generated C, models, etc..) In my .hgrc I've tried: [merge-tools] kdiff3= clobbermerge=internal:other clobbermerge.premerge = False [merge-patterns] **.c = kdiff3 **.h = kdiff3 **.mdl = clobbermerge but it still triggers kdiff3 for all files. Thoughts? An extension of this would be to perform a 'clobber merge' on a directory - but once the syntax is clear for a file suffix, the dir should be easy.

  Read the article

• Mercurial permament delete?

  - by Arnis L.

  I commit some 3rd party tools that i decided not to use afterwards and removed them from hg again. Thing that i dislike - they are still kept in history. Normally this is a good thing of course, but for this particular case - that's just a waste of space. What are options to intentionally mess around with hg repository history and weed it out?

  Read the article

• mercurial setup for Visual Studio 2008 projects

  - by Johannes

  What is a good setup for .hgignore file when working with Visual Studio 2008? I mostly develop on my own, only occasionly I clone the repository for somebody else to work on it. I'm thinking about obj folders, .suo, .sln, .user files etc.. Can they just be included or are there file I shouldn't include? Thanks! p.s.: at the moment I do the following : ignore all .pdb files and all obj folders. # regexp syntax. syntax: glob *.pdb syntax: regexp /obj/

  Read the article

• Using mercurial for web-design version control (dealing with images)

  - by Acorn

  I'm very new to Version Control, and I was wondering if I could get some advice on how it can fit into website design. At the moment I'm working on a typical, simple website that includes images: A few .html files and a .css file One folder full of photographs Another folder with the corresponding thumbnails Can I just put the whole lot in a repository? Or is there a better way I could apply Version Control to it? How should I deal with the images? edit: How well will it work with changes to the images? What if I decide to try and optimise my photographs or resize them. I wont be able to see what exactly changed about the images, should comments be enough to keep track of that?

  Read the article

• Branching and remote heads in Mercurial

  - by hekevintran

  I created a new branch using this command: hg branch new_branch After the first commit to the new branch, the default branch becomes inactive. If this is pushed the central repository will have only one head which belongs to the new branch. When my colleague pushes his commits on the default branch, he will get this error: pushing to ssh://... searching for changes abort: push creates new remote heads! (did you forget to merge? use push -f to force) Is there anything bad about forcing the push? Why are remote heads bad? How do you work remotely on separate branches and push to one repository?

  Read the article

• Multiset of shared_ptrs as a dynamic priority queue: Concept and practice

  - by Sarah

  I was using a vector-based priority queue typedef std::priority_queue< Event, vector< Event >, std::greater< Event > > EventPQ; to manage my Event objects. Now my simulation has to be able to find and delete certain Event objects not at the top of the queue. I'd like to know if my planned work-around can do what I need it to, and if I have the syntax right. I'd also like to know if dramatically better solutions exist. My plan is to make EventPQ a multiset of smart pointers to Event objects: typedef std::multi_set< boost::shared_ptr< Event > > EventPQ; I'm borrowing functions of the Event class from a related post on a multimap priority queue. // Event.h #include <cstdlib> using namespace std; #include <set> #include <boost/shared_ptr.hpp> class Event; typedef std::multi_set< boost::shared_ptr< Event > > EventPQ; class Event { public: Event( double t, int eid, int hid ); ~Event(); void add( EventPQ& q ); void remove(); bool operator < ( const Event & rhs ) const { return ( time < rhs.time ); } bool operator > ( const Event & rhs ) const { return ( time > rhs.time ); } double time; int eventID; int hostID; EventPQ* mq; EventPQ::iterator mIt; }; // Event.cpp Event::Event( double t, int eid, int hid ) { time = t; eventID = eid; hostID = hid; } Event::~Event() {} void Event::add( EventPQ& q ) { mq = &q; mIt = q.insert( boost::shared_ptr<Event>(this) ); } void Event::remove() { mq.erase( mIt ); mq = 0; mIt = EventPQ::iterator(); } I was hoping that by making EventPQ a container of pointers, I could avoid wasting time copying Events into the container and avoid accidentally editing the wrong copy. Would it be dramatically easier to store the Events themselves in EventPQ instead? Does it make more sense to remove the time keys from Event objects and use them instead as keys in a multimap? Assuming the current implementation seems okay, my questions are: Do I need to specify how to sort on the pointers, rather than the objects, or does the multiset automatically know to sort on the objects pointed to? If I have a shared_ptr ptr1 to an Event that also has a pointer in the EventPQ container, how do I find and delete the corresponding pointer in EventPQ? Is it enough to .find( ptr1 ), or do I instead have to find by the key (time)? Is the Event::remove() sufficient for removing the pointer in the EventPQ container? There's a small chance multiple events could be created with the same time (obviously implied in the use of multiset). If the find() works on event times, to avoid accidentally deleting the wrong event, I was planning to throw in a further check on eventID and hostID. Does this seem reasonable? (Dumb syntax question) In Event.h, is the declaration of dummy class Event;, then the EventPQ typedef, and then the real class Event declaration appropriate? I'm obviously an inexperienced programmer with very spotty background--this isn't for homework. Would love suggestions and explanations. Please let me know if any part of this is confusing. Thanks.

  Read the article

• acl.allow not working in mercurial

  - by sagar

  When I am trying to apply some authentication in .hg/hgrc file on Ubuntu machine its not working. I have added below code to hgrc file on Ubuntu [web] allow_push=* allow_read=* push_ssl =false [hooks] pretxnchangegroup.acl=python:hgext.acl.hook [acl.allow] /home/test/testrepository/*=myid When I am pushing some data from my Windows repository to testrepository on Ubuntu giving below message pushing to http://ubantuip:8000 searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files remote: error: pretxnchangegroup.acl hook failed: acl: access denied for changes et 69f00e372c67 remote: transaction abort! remote: rollback completed remote: abort: acl: access denied for changeset 69f00e372c67 why I am not able to push the changes?

  Read the article

• using sudo with mercurial and ssh authentication

  - by Shawn

  How do i run ssh-add key sudo hg clone [email protected]/etc/etc but use my ssh keys and not the superusers. Hey everyone, when i use sudo with for example, sudo hg clone [email protected]/etc/etc after i have added a key to my user account it doesnt work. I remember this is because the sudo is ran as the superuser but that user cannot have keys added to it. I remember setting some directive (im using debian) that allowed me to run that command as sudo, but still have my ssh keys taken from my normal user account but i didnt make a note of it at the time. Thanks.

  Read the article

• How to merge after reverting in mercurial?

  - by user281180

  I have had a bad merge. Now I want to start the merge all over again. I did a revert just before the merge. Now when im trying to add the bundle , im having the message and it can no more locate the changes. What is wrong? Why isn`t it finding any change? c:\Documents and Settings\Shamima\Desktop\New Folder\test_rev94_to_tip_hg\test_rev94_to_tip.hg searching for changes no changes found [command completed successfully Tue Apr 13 16:10:37 2010]

  Read the article

< Previous Page | 10 11 12 13 14 15 16 17 18 19 20 21  | Next Page >