mercurial - How to pull latest remote changes into remote repo (while using mqueues) -

-

the hg book recommends following workflow updating mqueue patches when remote repository has been updated link:

hg qpush --all  # qsave depricated (according hg qsave --help).  appears have been # depricated since @ least 2010.  additionally, qsave not working in environment  # due organization's commit hooks hg qsave  hg pull  hg update --clean  hg qpush -m -a

the qsave command says: 

> command deprecated, use "hg rebase" instead.

what new recommended workflow? want do:

  1. check out code
  2. make commits (probably not using mqueues)
  3. pull latest changes remote repo
  4. integrate changes repo. open rebase or merge workflow, want use kind of 3-way merge tool resolve conflicts

edit: workflow using is: 

hg qpop --all hg pullup hg qpush # repeat until no patches left.

the issue workflow generates .reject files.

i know can a: 

hg qpush --all hg pull --rebase

the issue don't know how abort or undo since modifies patches. think creates kind of backup described message: saved backup bundle /somedirectory/.hg/strip-backup/424323abc42a-backup.hg.

edit:

i did hg pull --rebase , worked well... think going use going forward. main uncomfort prefer merge rebase. want able see real parent of commits , how resolved conflicts. unfortunately, don't think merging , using mqueues compatible workflow. doesn't make sense pop patch has history on top of it...

edit:

thinking bit more, think workflow going try next time when know going have hairy conflicts: 

# convert patches real commits:  hg qfinish # args  # pull remote changes  # merge remote changes

i think in theory after doing rebase merges away in senario 7.


Comments

Post a Comment

Popular posts from this blog

c++ - No viable overloaded operator for references a map -

-
i trying use map can make tag names reference number. when try , use it, in code error (6 in total every time reference map): src/main.cpp:25:45: error: no viable overloaded operator[] type 'std::map<std::string, std::string>' const char* idcs = node.child_value(tagmap[3]); this code: #include "pugi/pugixml.hpp" #include <iostream> #include <string> #include <map> int main() { pugi::xml_document doca, docb; std::map<std::string, pugi::xml_node> mapa, mapb; std::map<std::string, std::string> tagmap {{"1", "data"}, {"2", "entry"}, {"3", "id"}, {"4", "content"}}; if (!doca.load_file("a.xml") || !docb.load_file("b.xml")) { std::cout << "can't find input files"; return 1; } (auto& node: doca.child(tagmap[1]).children(tagmap[2])) { co
Read more

java - Custom OutputStreamAppender not run: LOGBACK: No context given for <MYAPPENDER> -

-
i wish write custom appender on basis of outputstreamappender . wrote following class package tests; import java.io.ioexception; import java.io.outputstream; import ch.qos.logback.core.outputstreamappender; public class myappender<e> extends outputstreamappender<e> { public myappender() { system.out.println("myappender created"); setoutputstream(new outputstream() { @override public void write(int b) throws ioexception { throw new unsupportedoperationexception(); } }); } } then wrote following runner: package tests; import org.slf4j.loggerfactory; import ch.qos.logback.classic.logger; public class runner { private static final logger log = (logger) loggerfactory.getlogger(runner.class); public static void main(string[] args) { //log.addappender(new myappender<iloggingevent>()); log.info("hello world"); } } finall
Read more

java - Cannot secure connection using TLS -

-
i'm trying establish secure socket connection between java client applet (built jdk 1.7.0_75-b13) , vc++ server application. as test vehicle, used vc++ client/server sample found in msdn forums, modified use schannel , able establish socket using cipher suite tls_rsa_with_aes_128_cbc_sha. works of tls 1.0/1.1/1.2. when try opening socket java applet same server application, connection rejected server reporting following: tls 1.0 acceptsecuritycontext failed: 0x80090327 tls 1.1 acceptsecuritycontext failed: 0x80090331 tls 1.2 acceptsecuritycontext failed: 0x80090331 this java code used create socket: debugprint("setting secure connection"); sslsocketfactory sslsocketfactory = (sslsocketfactory) sslsocketfactory.getdefault(); sslsocket sslsocket = (sslsocket) sslsocketfactory.createsocket("127.0.0.1", socketnumber); debugprint("starting handshake"); sslsocket.settcpnodelay(true); sslsocket.setsolinger(false, 0); sslsocket.s
Read more